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

Change-Id: Ib577bd4a7decf56f3863feb65ac10e61d45c9beb