Merge "Revert "Revert "Remove unused clang builds 4579689, 4630689"""
am: f8e36b5586

Change-Id: I65bc083b3c403d53324470b360effa0bd4ab0c4c