Merge "Fix ARM64 build."