Merge "Fix issues with clang and BUILD_HOST_64bit."