Update checked-in binary to 0.6.21.3_r26639 (M6)

dart/tools/testing/dart/android.dart

Index: dart/tools/testing/dart/android.dart
diff --git a/dart/tools/testing/dart/android.dart b/dart/tools/testing/dart/android.dart
index 8f79ab4a063b178282491f77e50da4b6bb96af64..82bdfa9609295557b0a47a54ed77eeea00064650 100644
--- a/dart/tools/testing/dart/android.dart
+++ b/dart/tools/testing/dart/android.dart
@@ -4,9 +4,10 @@
 
 library android;
 
-import "dart:io";
 import "dart:async";
+import "dart:convert" show LineSplitter, UTF8;
 import "dart:core";
+import "dart:io";
 import "dart:utf";
 
 import "utils.dart";
@@ -35,7 +36,7 @@ Future _executeCommandRaw(String executable,
                           List<String> args,
                           [String stdin = ""]) {
   Future<String> getOutput(Stream<List<int>> stream) {
-    return stream.transform(new StringDecoder()).toList()
+    return stream.transform(UTF8.decoder).toList()
         .then((data) => data.join(""));
   }
 
@@ -112,7 +113,7 @@ class AndroidEmulator {
 
   AndroidEmulator._private(this._port, this._adbDevice, this._emulatorProcess) {
     Stream<String> getLines(Stream s) {
-      return s.transform(new StringDecoder()).transform(new LineTransformer());
+      return s.transform(UTF8.decoder).transform(new LineSplitter());
     }
 
     getLines(_emulatorProcess.stdout).listen((line) {