Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b am: 6976745a50
am: 3d2b904a6e

Change-Id: I7e691abe2e2ccec5d9477c528d603c081c0a5661