Merge "Remove LOCAL_CLANG" am: 231c627a55
am: 1d510671c7

Change-Id: Ia4f78dc67bc2fac65eba6bb23a273eb3575d9dce