Merge the Sky Engine changes from the SkyDart branch

sky/tests/framework/flights-app-pixels-expected.sky

Index: sky/tests/framework/flights-app-pixels-expected.sky
diff --git a/sky/tests/framework/flights-app-pixels-expected.sky b/sky/tests/framework/flights-app-pixels-expected.sky
index f9a661081e0cefbc6d577d76d123d1b51bda94c6..b05a8d535d297360b09c2898ef1051a35547edb3 100644
--- a/sky/tests/framework/flights-app-pixels-expected.sky
+++ b/sky/tests/framework/flights-app-pixels-expected.sky
@@ -1,13 +1,18 @@
 <sky>
-  <import src="../resources/run-after-display.sky" as="runAfterDisplay" />
+  <import src="../resources/run-after-display.sky"/>
 
   <img src="http://storage.googleapis.com/mojo/sky-pngs/5eb363566d6dbf6a3afdd9a0edd9f90a95f41582" />
 
   <script>
-    window.addEventListener('load', function() {
-      runAfterDisplay(function() {
+  import "dart:sky";
+  import "dart:sky.internals" as internals;
+
+  void main() {
+    window.addEventListener("load", (_) {
+      runAfterDisplay(() {
         internals.notifyTestComplete("");
       });
     });
+  }
   </script>
 </sky>