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

Change-Id: Id120218b75d2dc6d224ebfc8260145c4ad6a6743