Update checked-in binary to 0.6.21.3_r26639 (M6)

dart/tools/testing/dart/android.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library android;
 
+import "dart:async";
+import "dart:convert" show LineSplitter, UTF8;
+import "dart:core";
 import "dart:io";
-import "dart:async";
-import "dart:core";
 import "dart:utf";
 
 import "utils.dart";
 
 Future _executeCommand(String executable,
                        List<String> args,
                        [String stdin = ""]) {
   return _executeCommandRaw(executable, args, stdin).then((results) => null);
 }
 
 Future _executeCommandGetOutput(String executable,
                                 List<String> args,
                                 [String stdin = ""]) {
   return _executeCommandRaw(executable, args, stdin)
       .then((output) => output);
 }
 
 /**
  * [_executeCommandRaw] will write [stdin] to the standard input of the created
  * process and will return a tuple (stdout, stderr).
  *
  * If the exit code of the process was nonzero it will complete with an error.
  * If starting the process failed, it will complete with an error as well.
  */
 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(""));
   }
 
   DebugLogger.info("Running: '\$ $executable ${args.join(' ')}'");
   return Process.start(executable, args).then((Process process) {
     if (stdin != null && stdin != '') {
       process.stdin.write(stdin);
     }
     process.stdin.close();
 
@@ skipping 56 matching lines @@
     var portNumber = AdbServerPortPool.next();
     var args = ['-avd', '$avdName', '-port', "$portNumber" /*, '-gpu', 'on'*/];
     return Process.start("emulator64-arm", args).then((Process process) {
       var adbDevice = new AdbDevice('emulator-$portNumber');
       return new AndroidEmulator._private(portNumber, adbDevice, process);
     });
   }
 
   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) {
       log("stdout: ${line.trim()}");
     });
     getLines(_emulatorProcess.stderr).listen((line) {
       log("stderr: ${line.trim()}");
     });
     _emulatorProcess.exitCode.then((exitCode) {
       log("emulator exited with exitCode: $exitCode.");
@@ skipping 189 matching lines @@
  */
 class Intent {
   String action;
   String package;
   String activity;
   String dataUri;
 
   Intent(this.action, this.package, this.activity, [this.dataUri]);
 }