am acf00a8c: am d98fe91a: am 6b02b76a: Merge "Fix gcc color diagnostics"

* commit 'acf00a8c1756f68729b2142db7cfea81a59765e1':
  Fix gcc color diagnostics