Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4
am: 718d102f76  -s ours

* commit '718d102f7640432c68a78169e951aa0f390e9672':
  Improve the color comparison