Merge "Add preserve_extracted_files option in compare_images"