Merge "Fix make warning/error colors on Mac" am: a46695c337
am: 6ee5e52f77

Change-Id: I84a562377b14c310cd0c3259f110e82dd0fcfcca