Merge "Make it an error when LOCAL_CLANG is false." am: 9204b776bb
am: f329021c0f

Change-Id: Ie0ea0c0ce8125724cf5c0b4fcf8ec2147d7777e9