Revert two Kernel changes that were causing test failures.

tests/language/assert_message_test.dart

Index: tests/language/assert_message_test.dart
diff --git a/tests/language_2/assert_message_test.dart b/tests/language/assert_message_test.dart
similarity index 97%
rename from tests/language_2/assert_message_test.dart
rename to tests/language/assert_message_test.dart
index d2a8b2ea457f57dede1889bb1e306609241c2ee9..38c5d315b326c0bd04e2352505e1a03caf3a703b 100644
--- a/tests/language_2/assert_message_test.dart
+++ b/tests/language/assert_message_test.dart
@@ -2,13 +2,13 @@
 // 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.
 
+// SharedOptions=--assert-message
+
 import "dart:async";
 
 import "package:async_helper/async_helper.dart";
 import "package:expect/expect.dart";
 
-// TODO(rnystrom): Unify with assert_with_message_test.dart.
-
 main() {
   // Only run with asserts enabled mode.
   bool assertsEnabled = false;