Merge "[DO NOT MERGE] Improve image comparision algorithm for ThemeHostTest" into nougat-cts-dev
am: 6bb3bb9b4b  -s ours

Change-Id: I7158bacc0bb45816b1c7172a447a41fd00cedd5a