Merge "Fix arm64/x86 build."