am 7f18adc2: am 871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags."
am 7f18adc2: am 871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags."

* commit '7f18adc240ca311d225ee9164e6d982f9a005d62':
  Add -fcolor-diagnostics to global clang cflags.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build