Merge the Sky Engine changes from the SkyDart branch

sky/tests/lowlevel/layers-expected.sky

Index: sky/tests/lowlevel/layers-expected.sky
diff --git a/sky/tests/lowlevel/layers-expected.sky b/sky/tests/lowlevel/layers-expected.sky
index 9bbb4e55d079bda8ff185796d48af4af090cb075..877ef5c9a77c01a30dc1336d8d67b6a62dcad516 100644
--- a/sky/tests/lowlevel/layers-expected.sky
+++ b/sky/tests/lowlevel/layers-expected.sky
@@ -1,13 +1,18 @@
 <foo>
-<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/ed3514fd579dbaa8c18594cf99f3b60bf4b6ee75" />
 
 <script>
-window.addEventListener('load', function() {
-  runAfterDisplay(function() {
-    internals.notifyTestComplete("");
+import "dart:sky";
+import "dart:sky.internals" as internals;
+
+void main() {
+  window.addEventListener('load', (_) {
+    runAfterDisplay(() {
+      internals.notifyTestComplete("");
+    });
   });
-});
+}
 </script>
 </foo>