Merge "Remove LOCAL_CLANG" am: ad5da5881d am: bd750da7f1 am: 584a03ec4a
am: da0846165e

Change-Id: Iea42906b898d2b631c19177ea83355b86d279f21