Merge "Revert "Fix arm64 build""