This reverts commit 457f6ef140.
Reason for revert: fix the color check in repohook
Test: make RunSettingsRoboTests
Change-Id: I1b466c412138dfb0f2bffc4270a8932fe3b81c94
This reverts commit 3515bc7259.
Reason for revert: CLs in this topic break color check in repohook.
Bug: 110960820
Change-Id: I5934b6baf65515ebbc4e4660ed99747dd581f526