Merge "Revert "Revert "Remove unused clang builds 4579689, 4630689"""