Merge "Add 'whitelist' option to compare_images" am: 0cf2d79947 am: 9e15fceb00
am: 1eeb9320bf

Change-Id: I6b3cdadd5d7f2f9fc9ba978b3fc7fc1e0b6d5435