Merge "Enable building with clang/llvm."