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

Change-Id: I6b1d4324025169ab46112c7a90ef922ec2da2a8c