[Android] Switch instrumentation tests to the new shard/runner paradigm.

build/android/pylib/gtest/test_runner.py

 # Copyright (c) 2012 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.
 
 import glob
 import logging
 import os
 
 from pylib import android_commands
 from pylib import constants
 from pylib import perf_tests_helper
 from pylib.android_commands import errors
-from pylib.base import new_base_test_runner as base_test_runner
+from pylib.base import base_test_runner
 from pylib.base import test_result
 from pylib.utils import run_tests_helper
 
 import test_package_apk
 import test_package_executable
 
 
 def _GetDataFilesForTestSuite(test_suite_basename):
   """Returns a list of data files/dirs needed by the test suite.
 
@@ skipping 258 matching lines @@
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()