Merge "Remove unused clang-r428724"