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

Change-Id: Ibfab109fc248d0f314e58dab95d871a3693121c5