Update tests after rebase

compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.kt

@@ -1,5 +1,3 @@
-// !WITH_NEW_INFERENCE
-
 // FILE: P.java
 
 import java.util.ArrayList;
@@ -15,5 +13,5 @@ public class P {
 
 fun foo(c: P): MutableList<Int> {
     // Error should be here: see KT-8168 Typechecker fails for platform collection type
-    return <!TYPE_MISMATCH{NI}!>c.getList() ?: <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{OI}!>listOf()<!><!>
+    return <!TYPE_MISMATCH!>c.getList() ?: listOf()<!>
 }