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

Change-Id: Ie9d9f4864c0e85375dace272cb9e389b3f02c573