Merge "Remove LOCAL_CLANG"
am: 989b8c6678

Change-Id: I692f44fcb76b571c264c3506ccc0debb33e4b751