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

Change-Id: I473955548de326633f0be3ee85586180128bf9ef