Merge "Remove unused clang-r475365."