Fix apptest builds and runner on Android.

mojo/tools/apptest_runner.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A test runner for gtest application tests."""
 
 import argparse
 import logging
 import sys
 
 from mopy import dart_apptest
 from mopy import gtest
-# TODO(msw): Mojo's script pulls in android.py via mojo/devtools/common/pylib.
 from mopy.android import AndroidShell
 from mopy.config import Config
 from mopy.gn import ConfigForGNArgs, ParseGNConfig
 from mopy.log import InitLogging
 from mopy.paths import Paths
 
 
 _logger = logging.getLogger()
 
 
@@ skipping 16 matching lines @@
   execution_globals = {"config": config}
   exec args.test_list_file in execution_globals
   test_list = execution_globals["tests"]
   _logger.debug("Test list: %s" % test_list)
 
   extra_args = []
   if config.target_os == Config.OS_ANDROID:
     paths = Paths(config)
     shell = AndroidShell(paths.target_mojo_shell_path, paths.build_dir,
                          paths.adb_path)
-    extra_args.extend(shell.PrepareShellRun(fixed_port=False))
+    extra_args.extend(shell.PrepareShellRun('localhost'))
   else:
     shell = None
 
   gtest.set_color()
 
   exit_code = 0
   for test_dict in test_list:
     test = test_dict["test"]
     test_name = test_dict.get("name", test)
     test_type = test_dict.get("type", "gtest")
@@ skipping 20 matching lines @@
     if apptest_result != "Succeeded":
       exit_code = 1
     print apptest_result
     _logger.info("Completed: %s" % test_name)
 
   return exit_code
 
 
 if __name__ == '__main__':
   sys.exit(main())