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

Change-Id: Iebdf2970e28110799d6e61635dc2db6e8d2a822f