Merge "Allow HOST_ARCH x86_64 to build."