Merge "Improve the color comparison" into kitkat-cts-dev
am: 1510424e14

* commit '1510424e1436490d301953513fd1dc1b59dddc1a':
  Improve the color comparison