Merge "Fix double closes in ziparchive tests."