Revert two Kernel changes that were causing test failures.

pkg/front_end/lib/src/fasta/kernel/kernel_enum_builder.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.kernel_enum_builder;
 
 import 'package:kernel/ast.dart'
     show
         Arguments,
         Class,
@@ skipping 107 matching lines @@
     /// From Dart Programming Language Specification 4th Edition/December 2015:
     ///     metadata class E {
     ///       final int index;
     ///       const E(this.index);
     ///       static const E id0 = const E(0);
     ///       ...
     ///       static const E idn-1 = const E(n - 1);
     ///       static const List<E> values = const <E>[id0, ..., idn-1];
     ///       String toString() => { 0: ‘E.id0’, . . ., n-1: ‘E.idn-1’}[index]
     ///     }
-    members["index"] = new KernelFieldBuilder(null, null, intType, "index",
-        finalMask, parent, charOffset, null, true);
+    members["index"] = new KernelFieldBuilder(
+        null, intType, "index", finalMask, parent, charOffset, null, true);
     KernelConstructorBuilder constructorBuilder = new KernelConstructorBuilder(
         null,
-        null,
         constMask,
         null,
         "",
         null,
         <FormalParameterBuilder>[
           new KernelFormalParameterBuilder(
               null, 0, intType, "index", true, parent, charOffset)
         ],
         parent,
         charOffset,
         charOffset,
         charEndOffset);
     constructors[""] = constructorBuilder;
     int index = 0;
     List<MapEntry> toStringEntries = <MapEntry>[];
-    KernelFieldBuilder valuesBuilder = new KernelFieldBuilder(
-        null,
-        null,
-        listType,
-        "values",
-        constMask | staticMask,
-        parent,
-        charOffset,
-        null,
-        true);
+    KernelFieldBuilder valuesBuilder = new KernelFieldBuilder(null, listType,
+        "values", constMask | staticMask, parent, charOffset, null, true);
     members["values"] = valuesBuilder;
     KernelProcedureBuilder toStringBuilder = new KernelProcedureBuilder(
         null,
-        null,
         0,
         stringType,
         "toString",
         null,
         null,
         ProcedureKind.Method,
         parent,
         charOffset,
         charOffset,
         charEndOffset);
     members["toString"] = toStringBuilder;
     String className = name;
     for (int i = 0; i < constantNamesAndOffsets.length; i += 2) {
       String name = constantNamesAndOffsets[i];
       int charOffset = constantNamesAndOffsets[i + 1];
       if (members.containsKey(name)) {
         parent.addCompileTimeError(templateDuplicatedName.withArguments(name),
             charOffset, parent.fileUri);
         constantNamesAndOffsets[i] = null;
         continue;
       }
       if (name == className) {
         parent.addCompileTimeError(
             templateEnumConstantSameNameAsEnclosing.withArguments(name),
             charOffset,
             parent.fileUri);
         constantNamesAndOffsets[i] = null;
         continue;
       }
-      KernelFieldBuilder fieldBuilder = new KernelFieldBuilder(
-          null,
-          null,
-          selfType,
-          name,
-          constMask | staticMask,
-          parent,
-          charOffset,
-          null,
-          true);
+      KernelFieldBuilder fieldBuilder = new KernelFieldBuilder(null, selfType,
+          name, constMask | staticMask, parent, charOffset, null, true);
       members[name] = fieldBuilder;
       toStringEntries.add(new MapEntry(
           new IntLiteral(index), new StringLiteral("$className.$name")));
       index++;
     }
     MapLiteral toStringMap = new MapLiteral(toStringEntries, isConst: true);
     KernelEnumBuilder enumBuilder = new KernelEnumBuilder.internal(
         null,
         metadata,
         name,
@@ skipping 95 matching lines @@
     }
     return super.build(libraryBuilder, coreLibrary);
   }
 
   @override
   Builder findConstructorOrFactory(
       String name, int charOffset, Uri uri, LibraryBuilder library) {
     return null;
   }
 }