Eleven: Make sure we have vibrant colors for all default colors

Change-Id: I4be163e75fc35d3b139439c504d769d17d980ace
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0