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

* commit 'd98fe91a7524d40808ae4ed562aeb38e9eedf593':
  Fix gcc color diagnostics