Merge "Remove File.deleteOnExit in ZipEntryTest"