Merge the Sky Engine changes from the SkyDart branch

sky/tests/harness/reftest-mismatch-expected-mismatch.sky

Index: sky/tests/harness/reftest-mismatch-expected-mismatch.sky
diff --git a/sky/tests/harness/reftest-mismatch-expected-mismatch.sky b/sky/tests/harness/reftest-mismatch-expected-mismatch.sky
index 42f71f7abbbe993594a6d59def97ab9b47f9d80d..1469024023d19fc4860e2e8e4d68f593f73c25eb 100644
--- a/sky/tests/harness/reftest-mismatch-expected-mismatch.sky
+++ b/sky/tests/harness/reftest-mismatch-expected-mismatch.sky
@@ -1,9 +1,13 @@
 <foo>
-<import src="../resources/run-after-display.sky" as="runAfterDisplay" />
+<import src="../resources/run-after-display.sky" />
 This is a mismatch reftest.
 <script>
-runAfterDisplay(function() {
-    internals.notifyTestComplete("");
-});
+import "dart:sky.internals" as internals;
+
+void main() {
+    runAfterDisplay(() {
+        internals.notifyTestComplete("");
+    });
+}
 </script>
 </foo>