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

Change-Id: I150ff727e35ddac8dc2a8401a3cd5e2d4a04bd2d