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

Change-Id: Ia9b08f47cbe9098c262f9202465475dac4912b63