Merge "Add preserve_extracted_files option in compare_images"
am: 384d61d947

Change-Id: I2dbd688f1e53a3c2c27fda08e3a674b924b8aa61