Merge "Revert "Remove File.deleteOnExit in ZipEntryTest""