Merge \\"Error colors to point to frameworks instead of hard-coding them\\"...
Merge \\"Error colors to point to frameworks instead of hard-coding them\\" into nyc-mr1-dev am: d25148c8
am: 4a8695ed -s ours
Change-Id: I92b60a1f949a1ce73df5afebf57726921d8f9b4e