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

Change-Id: Ibbf20780454133924b3292156968b57008c3f73d