Merge "Remove LOCAL_CLANG" am: b87f884d1a am: c541d3f402
am: 3223af6da4

Change-Id: I4db4e7386e956a399f7dd9ffc1883a33ff106a4f