Merge "Fix double closes in ziparchive tests." am: 3a2bd498f8 am: fab35114e5
am: cee57a5ff4

Change-Id: Iaabe72d18cb7dffe5b5ca60f0821d601263b75e8