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

Change-Id: I3e852ceb99dc0351259813b718e9914ad7195fd8