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

Change-Id: I481577bcbc7ec678bfe437447128c78cb168eadf