Merge \"Revert \"Error colors to point to frameworks rather than hard-code them\"\" into nyc-mr1-dev
am: 22d09743d8

Change-Id: If9113aab011035227930b2df6b68341ee3774bd3