Revert "New J2K: fix testdata"

This reverts commit 285aa123

nj2k/testData/newJ2k/issues/kt-19604.kt

@@ -3,6 +3,6 @@ import java.util.HashMap
 class TestMethodReference {
     private val hashMap = HashMap<String, String>()
     fun update(key: String, msg: String) {
-        hashMap.merge(key, msg) { obj: String, str: String -> obj + str }
+        hashMap.merge(key, msg) { obj: String, s: String -> obj + s }
     }
 }

nj2k/testData/newJ2k/issues/kt-19606.kt

@@ -3,6 +3,6 @@ import java.util.HashMap
 class TestMethodReference {
     private val hashMap = HashMap<String, String>()
     fun update(key: String, msg: String) {
-        hashMap.merge(key, msg) { obj: String, str: String -> obj + str }
+        hashMap.merge(key, msg) { obj: String, s: String -> obj + s }
     }
 }

nj2k/testData/newJ2k/issues/kt-32702.kt

@@ -5,6 +5,6 @@ internal class Test {
     fun context() {
         val items: MutableList<Double> = ArrayList()
         items.add(1.0)
-        items.forEach(Consumer { x: Double? -> println(x) })
+        items.forEach(Consumer { o: Double? -> println(o) })
     }
 }