Merge "Remove LOCAL_CLANG"
am: b87f884d1a

Change-Id: Ied387cd76797ca043f5f24590fdb26e5a7a5d29c