SDK fixes

test/dart_codegen/expect/convert/encoding.dart

Index: test/dart_codegen/expect/convert/encoding.dart
diff --git a/test/dart_codegen/expect/convert/encoding.dart b/test/dart_codegen/expect/convert/encoding.dart
index 51ef2ae48ca3d92f4d71d6a5990e99fbdaa8eb36..2ab38d8d0840a339d9975335f5c8c53fd6a93876 100644
--- a/test/dart_codegen/expect/convert/encoding.dart
+++ b/test/dart_codegen/expect/convert/encoding.dart
@@ -1,15 +1,11 @@
 part of dart.convert;
  abstract class Encoding extends Codec<String, List<int>> {const Encoding();
  Future<String> decodeStream(Stream<List<int>> byteStream) {
-  return ((__x5) => DEVC$RT.cast(__x5, DEVC$RT.type((DDC$async$.Future<dynamic> _) {
+  return ((__x3) => DEVC$RT.cast(__x3, DEVC$RT.type((DDC$async$.Future<dynamic> _) {
     }
   ), DEVC$RT.type((DDC$async$.Future<String> _) {
     }
-  ), "CompositeCast", """line 14, column 12 of dart:convert/encoding.dart: """, __x5 is DDC$async$.Future<String>, false))(byteStream.transform(DEVC$RT.cast(decoder, DEVC$RT.type((Converter<List<int>, String> _) {
-    }
-  ), DEVC$RT.type((DDC$async$.StreamTransformer<List<int>, dynamic> _) {
-    }
-  ), "CompositeCast", """line 15, column 18 of dart:convert/encoding.dart: """, decoder is DDC$async$.StreamTransformer<List<int>, dynamic>, false)).fold(new StringBuffer(), (buffer, string) => buffer..write(string)).then((buffer) => buffer.toString()));
+  ), "CompositeCast", """line 14, column 12 of dart:convert/encoding.dart: """, __x3 is DDC$async$.Future<String>, false))(byteStream.transform(decoder).fold(new StringBuffer(), (buffer, string) => buffer..write(string)).then((buffer) => buffer.toString()));
   }
  String get name;
  static Map<String, Encoding> _nameToEncoding = <String, Encoding> {