Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b am: f7b315c985 am: 8a8b97b271 am: e1332dd01b
am: 6da3de27be

Change-Id: I70d004aa8dfdb54e20552af20168892d4caf20c4