Merge "Fix ZipFilePerfTest issues by closing the file in each loop iteration."

apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java

@@ -70,6 +70,9 @@ public class ZipFilePerfTest {
         BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
         while (state.keepRunning()) {
             ZipFile zf = new ZipFile(mFile);
+            state.pauseTiming();
+            zf.close();
+            state.resumeTiming();
         }
     }