Merge upstream clang.