Merge upstream LLVM to 223068.