Drop enum class object hack

Place valueOf() and values() into the static scope of the corresponding enum
class

 #KT-5580 Fixed
 #KT-2410 Fixed

compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt

@@ -9,12 +9,6 @@ internal final enum class En : kotlin.Enum<test.En> {
     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-En> {
-        /*primary*/ private constructor <class-object-for-En>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.En
-        public final /*synthesized*/ fun values(): kotlin.Array<test.En>
-    }
-    
     public enum entry E1 : test.En {
         /*primary*/ private constructor E1()
         internal final override /*1*/ /*fake_override*/ val b: kotlin.Boolean
@@ -74,4 +68,8 @@ internal final enum class En : kotlin.Enum<test.En> {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.En
+    public final /*synthesized*/ fun values(): kotlin.Array<test.En>
 }