Merge "Fix build error on darwin_arm64"