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

Change-Id: I9e9bf94c7e6444657aad1f4a9f7ffe4eac3e7872