[Android] Remove more uses of android_commands from build/android/pylib. (RELAND)

build/android/pylib/host_driven/test_runner.py

 # Copyright 2013 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.
 
 """Runs host-driven tests on a particular device."""
 
 import logging
 import sys
 import time
 import traceback
@@ skipping 68 matching lines @@
       A TestRunResults object which contains the result produced by the test
       and, in the case of a failure, the test that should be retried.
     """
 
     assert isinstance(test, test_case.HostDrivenTestCase)
 
     start_date_ms = int(time.time()) * 1000
     exception_raised = False
 
     try:
-      test.SetUp(str(self.device), self.shard_index)
+      test.SetUp(self.device, self.shard_index)
     except Exception:
       logging.exception(
           'Caught exception while trying to run SetUp() for test: ' +
           test.tagged_name)
       # Tests whose SetUp() method has failed are likely to fail, or at least
       # yield invalid results.
       exc_info = sys.exc_info()
       results = base_test_result.TestRunResults()
       results.AddResult(HostDrivenExceptionTestResult(
           test.tagged_name, start_date_ms, exc_info))
@@ skipping 24 matching lines @@
         # until the test is fixed.
         exc_info = sys.exc_info()
         results = base_test_result.TestRunResults()
         results.AddResult(HostDrivenExceptionTestResult(
             test.tagged_name, start_date_ms, exc_info))
 
     if not results.DidRunPass():
       return results, test
     else:
       return results, None