Merge pull request #335 from yoshisuga/ios-arm64-buildbot-fix