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

#KT-4149 Fixed
 #KT-4839 Fixed

compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt

@@ -2,21 +2,14 @@ package test
 
 public open class DeeplyNestedStatic {
     public constructor DeeplyNestedStatic()
-
+    
     public open class Foo {
         public constructor Foo()
-
+        
         public open class Bar {
             public constructor Bar()
-        }
-    }
-}
-
-package test.DeeplyNestedStatic {
-
-    package test.DeeplyNestedStatic.Foo {
-
-        package test.DeeplyNestedStatic.Foo.Bar {
+            
+            // Static members
             public open fun method(): kotlin.Unit
         }
     }

compiler/testData/loadJava/compiledJava/static/Simple.txt

@@ -3,8 +3,7 @@ package test
 public open class Simple {
     public constructor Simple()
     public open fun foo(): kotlin.Unit
-}
-
-package test.Simple {
+    
+    // Static members
     public open fun bar(): kotlin.Unit
 }

compiler/testData/loadJava/compiledJava/static/StaticFinal.txt

@@ -2,8 +2,7 @@ package test
 
 public open class StaticFinal {
     public constructor StaticFinal()
-}
-
-package test.StaticFinal {
-    public val foo: kotlin.String = "aaa"
+    
+    // Static members
+    public final val foo: kotlin.String = "aaa"
 }

compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt

@@ -4,29 +4,28 @@ public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEn
     private constructor StaticMembersInEnum()
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-
+    
     public class object <class-object-for-StaticMembersInEnum> {
         private constructor <class-object-for-StaticMembersInEnum>()
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum
         public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
     }
-
+    
     public enum entry ENTRY : test.StaticMembersInEnum {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-
+        
         public class object <class-object-for-ENTRY> : test.StaticMembersInEnum.ENTRY {
             private constructor <class-object-for-ENTRY>()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
-}
-
-package test.StaticMembersInEnum {
-    public val CONSTANT: test.StaticMembersInEnum
-    public var STATIC_FIELD: kotlin.Int
+    
+    // Static members
+    public final val CONSTANT: test.StaticMembersInEnum
+    public final var STATIC_FIELD: kotlin.Int
     public open fun foo(): kotlin.Unit
     public open fun valueOf(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open fun values(/*0*/ p0: kotlin.Int): kotlin.Unit