Merge "Merge "Merge "[DO NOT MERGE] Improve image comparision algorithm for ThemeHostTest" into nougat-cts-dev am: 6bb3bb9b4b  -s ours" into nougat-mr1-cts-dev am: 955304d5a1  -s ours" am: cab69b5ece  -s ours am: 88c0a58be2  -s ours
am: a142c0c0ec  -s ours

Change-Id: I2add445e8a7558f120c03e3a1f30fb756115f036