Merge "LOCAL_CLANG := true is now the default"
am: 1204e3806f

Change-Id: Id579bdea109bca2056cea6c0359e18b120801bf4