Merge "Remove LOCAL_CLANG" am: ad5da5881d
am: bd750da7f1

Change-Id: I5ad29dca6ba91e722232fc76802858276dd1b64c