Merge "Remove File.deleteOnExit in ZipEntryTest"
am: 3d083b32d3

Change-Id: I3bc63a9dcf671cdb1537df42c4532a567f09ded3