Rewrite Java resolve to use static class scope instead of synthesized packages

#KT-4149 Fixed
 #KT-4839 Fixed

compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt

@@ -6,6 +6,9 @@ public fun topLevelFunction(): kotlin.Unit
 public open class JavaClass {
     public constructor JavaClass()
     public open fun instanceMethod(): kotlin.Unit
+    
+    // Static members
+    public open fun staticMethod(): kotlin.Unit
 }
 
 public final class KotlinClass {
@@ -16,18 +19,13 @@ public trait SamInterface {
     public abstract fun instanceMethod(): kotlin.Unit
 }
 
-package test.JavaClass {
-    public open fun staticMethod(): kotlin.Unit
-}
-
 package test.sub {
-
+    
     public open class JavaClassInSubpackage {
         public constructor JavaClassInSubpackage()
         public open fun instanceMethod(): kotlin.Unit
-    }
-
-    package test.sub.JavaClassInSubpackage {
+        
+        // Static members
         public open fun staticMethod(): kotlin.Unit
     }
 }