Merge "Remove unused clang-r416183b1"