Merge "Remove LOCAL_CLANG" am: 989b8c6678 am: 842c7f0c1a am: 2530b778d5 am: 2af93e3e40
am: ea40c76ce7

Change-Id: Ib4206ffb05d9ba0bd1d2c35318bc782bcf66cfd0