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

Change-Id: I6faf6bd1389d4273013ba33a029d48323b4c9e4f