Merge "Remove LOCAL_CLANG and clang: true" am: 481127a308 am: 9b92a1d118
am: 8a7931e8ff

Change-Id: I151a741309c31755f427e75c81090cae38917a76