Merge "Remove LOCAL_CLANG and clang: true"