Merge "Improve imgdiff for large zip files" am: 9f48641784
am: e24e90f403

Change-Id: I2692f832b720bdf966263d35f8e0a0bab8fe0699