Merge the Sky Engine changes from the SkyDart branch

sky/tests/resources/dump-as-markup.sky

Index: sky/tests/resources/dump-as-markup.sky
diff --git a/sky/tests/resources/dump-as-markup.sky b/sky/tests/resources/dump-as-markup.sky
index cebf2d49fbd11d45e2577a0d4c049ece058ecf66..03513106c0bba553584b8658370f662a88b456c1 100644
--- a/sky/tests/resources/dump-as-markup.sky
+++ b/sky/tests/resources/dump-as-markup.sky
@@ -1,6 +1,11 @@
-<import src="/sky/framework/dom-serializer.sky" as="DomSerializer" />
+<import src="/sky/framework/dom-serializer.sky" as="DomSerializer"/>
 <script>
-window.addEventListener('load', function() {
-  internals.notifyTestComplete(DomSerializer.serializeNode(document));
-});
+import "dart:sky";
+import "dart:sky.internals" as internals;
+
+void init() {
+  window.addEventListener('load', (_) {
+    internals.notifyTestComplete(DomSerializer.serializeNode(document));
+  });
+}
 </script>