Merge "Remove LOCAL_CLANG" am: b87f884d1a
am: c541d3f402

Change-Id: I29098b4ca9e44f5bcc517279f45249a0a97586bd