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

Change-Id: I669b3c3ab5ce1eb1c0d2504c07f0b3c1c8fdec89