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

Change-Id: Ibc3e4113822860dc8d122a82cdd0ad3d8daae5f9