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

Change-Id: Ib559d9f977355aa8d9631a334dca86b7c5328f44