diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 250018d875..a16a18d6c7 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-aa9ce7092801e7ed8f3f86df0d1067279d13784d
+d2b69fec751d6d11f62019c863b2cba4ce575bfe
diff --git a/packages/flutter/test/painting/decoration_test.dart b/packages/flutter/test/painting/decoration_test.dart
index 6661fe117c..0b67c90c66 100644
--- a/packages/flutter/test/painting/decoration_test.dart
+++ b/packages/flutter/test/painting/decoration_test.dart
@@ -3,7 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:ui' as ui show Image, ColorFilter;
+import 'dart:typed_data';
+import 'dart:ui' as ui show EncodingFormat, Image, ColorFilter;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
@@ -87,6 +88,11 @@ class TestImage implements ui.Image {
 
   @override
   void dispose() { }
+
+  @override
+  Future<ByteData> toByteData({ui.EncodingFormat format}) async {
+    throw new UnsupportedError('Cannot encode test image');
+  }
 }
 
 void main() {
diff --git a/packages/flutter/test/painting/image_stream_test.dart b/packages/flutter/test/painting/image_stream_test.dart
index e032316513..a6809a9378 100644
--- a/packages/flutter/test/painting/image_stream_test.dart
+++ b/packages/flutter/test/painting/image_stream_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:flutter/painting.dart';
@@ -37,6 +38,11 @@ class FakeImage implements Image {
 
   @override
   void dispose() {}
+
+  @override
+  Future<ByteData> toByteData({EncodingFormat format}) async {
+    throw new UnsupportedError('Cannot encode test image');
+  }
 }
 
 class MockCodec implements Codec {
diff --git a/packages/flutter/test/painting/paint_image_test.dart b/packages/flutter/test/painting/paint_image_test.dart
index dd30a863ab..9d571526b1 100644
--- a/packages/flutter/test/painting/paint_image_test.dart
+++ b/packages/flutter/test/painting/paint_image_test.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
+import 'dart:typed_data';
 import 'dart:ui' as ui;
 
 import 'package:flutter/painting.dart';
@@ -19,6 +21,11 @@ class TestImage implements ui.Image {
 
   @override
   void dispose() { }
+
+  @override
+  Future<ByteData> toByteData({ui.EncodingFormat format}) async {
+    throw new UnsupportedError('Cannot encode test image');
+  }
 }
 
 class TestCanvas implements Canvas {
diff --git a/packages/flutter/test/painting/shape_decoration_test.dart b/packages/flutter/test/painting/shape_decoration_test.dart
index 72e9bdd51e..510c5661f1 100644
--- a/packages/flutter/test/painting/shape_decoration_test.dart
+++ b/packages/flutter/test/painting/shape_decoration_test.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
+import 'dart:typed_data';
 import 'dart:ui' as ui;
 
 import 'package:flutter/foundation.dart';
@@ -121,4 +123,9 @@ class TestImage implements ui.Image {
 
   @override
   void dispose() { }
+
+  @override
+  Future<ByteData> toByteData({ui.EncodingFormat format}) async {
+    throw new UnsupportedError('Cannot encode test image');
+  }
 }
diff --git a/packages/flutter/test/rendering/image_test.dart b/packages/flutter/test/rendering/image_test.dart
index 72eca11ef6..402e83fc81 100644
--- a/packages/flutter/test/rendering/image_test.dart
+++ b/packages/flutter/test/rendering/image_test.dart
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui' as ui show Image;
+import 'dart:async';
+import 'dart:typed_data';
+import 'dart:ui' as ui show EncodingFormat, Image;
 
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -16,6 +18,11 @@ class SquareImage implements ui.Image {
   @override
   int get height => 10;
 
+  @override
+  Future<ByteData> toByteData({ui.EncodingFormat format}) async {
+    throw new UnsupportedError('Cannot encode test image');
+  }
+
   @override
   String toString() => '[$width\u00D7$height]';
 
@@ -30,6 +37,11 @@ class WideImage implements ui.Image {
   @override
   int get height => 10;
 
+  @override
+  Future<ByteData> toByteData({ui.EncodingFormat format}) async {
+    throw new UnsupportedError('Cannot encode test image');
+  }
+
   @override
   String toString() => '[$width\u00D7$height]';
 
@@ -44,6 +56,11 @@ class TallImage implements ui.Image {
   @override
   int get height => 20;
 
+  @override
+  Future<ByteData> toByteData({ui.EncodingFormat format}) async {
+    throw new UnsupportedError('Cannot encode test image');
+  }
+
   @override
   String toString() => '[$width\u00D7$height]';
 
diff --git a/packages/flutter/test/widgets/image_resolution_test.dart b/packages/flutter/test/widgets/image_resolution_test.dart
index bd78f0d294..19036366b4 100644
--- a/packages/flutter/test/widgets/image_resolution_test.dart
+++ b/packages/flutter/test/widgets/image_resolution_test.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 import 'dart:typed_data';
-import 'dart:ui' as ui show Image;
+import 'dart:ui' as ui show EncodingFormat, Image;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/rendering.dart';
@@ -24,6 +24,11 @@ class TestImage implements ui.Image {
 
   @override
   void dispose() { }
+
+  @override
+  Future<ByteData> toByteData({ui.EncodingFormat format}) async {
+    throw new UnsupportedError('Cannot encode test image');
+  }
 }
 
 class TestByteData implements ByteData {
diff --git a/packages/flutter/test/widgets/image_rtl_test.dart b/packages/flutter/test/widgets/image_rtl_test.dart
index bbaf27a289..492a326827 100644
--- a/packages/flutter/test/widgets/image_rtl_test.dart
+++ b/packages/flutter/test/widgets/image_rtl_test.dart
@@ -3,7 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:ui' as ui show Image;
+import 'dart:typed_data';
+import 'dart:ui' as ui show EncodingFormat, Image;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
@@ -34,6 +35,11 @@ class TestImage implements ui.Image {
 
   @override
   void dispose() { }
+
+  @override
+  Future<ByteData> toByteData({ui.EncodingFormat format}) async {
+    throw new UnsupportedError('Cannot encode test image');
+  }
 }
 
 void main() {
diff --git a/packages/flutter/test/widgets/image_test.dart b/packages/flutter/test/widgets/image_test.dart
index 4df3d4e1ba..a060f99bc2 100644
--- a/packages/flutter/test/widgets/image_test.dart
+++ b/packages/flutter/test/widgets/image_test.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 import 'dart:typed_data';
-import 'dart:ui' as ui show Image;
+import 'dart:ui' as ui show EncodingFormat, Image;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/rendering.dart';
@@ -483,6 +483,11 @@ class TestImage implements ui.Image {
   @override
   void dispose() { }
 
+  @override
+  Future<ByteData> toByteData({ui.EncodingFormat format}) async {
+    throw new UnsupportedError('Cannot encode test image');
+  }
+
   @override
   String toString() => '[$width\u00D7$height]';
 }