Merge "Fix arm64 build"