Merge "Fix the build with a newer LLVM."