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

Change-Id: Icbac2607b6e772db3e9bfe6fdbf7760d48bd2f8c