Merge "Remove unused clang-r370808b"