Merge "Fix arm64 and x86 builds"