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

Change-Id: I556e40803c942626dceafc7e12278d75ef33337f