add more colors

Change-Id: I96e1e1275f9cea30ae535ece8706f5c5e4c88952
allow a device to use its own headers first

Change-Id: I4400e5eb9c2ac4aaf8d967ab51cfa3bceb13b6fe
revert: recovery inclusion

Change-Id: I4e3ce8a0f6d2ae20649525f9a2ceb4883c2ba6da