Merge "Update NonVirtualOverrideTest to enable compiling a testJar with R8"
diff --git a/src/main/java/com/android/tools/r8/graph/DexByteCodeWriter.java b/src/main/java/com/android/tools/r8/graph/DexByteCodeWriter.java
index 60893c7..9710fe8 100644
--- a/src/main/java/com/android/tools/r8/graph/DexByteCodeWriter.java
+++ b/src/main/java/com/android/tools/r8/graph/DexByteCodeWriter.java
@@ -66,7 +66,7 @@
       if (anyMethodMatches(clazz)) {
         PrintStream ps = outputStreamProvider.apply(clazz);
         try {
-          writeClass(clazz, outputStreamProvider.apply(clazz));
+          writeClass(clazz, ps);
         } finally {
           closer.accept(ps);
         }