Merge "Remove unused clang-r416183c1"