Revert 237667 "[Telemetry] Refactor common Android test harness ..."

trunk/src/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

Index: trunk/src/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
===================================================================
--- trunk/src/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py	(revision 237673)
+++ trunk/src/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py	(working copy)
@@ -17,9 +17,6 @@
 from telemetry.core.backends.chrome import android_browser_backend
 from telemetry.core.platform import android_platform_backend
 
-util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
-from pylib.utils import test_environment  # pylint: disable=F0401
-
 CHROME_PACKAGE_NAMES = {
   'android-content-shell':
       ['org.chromium.content_shell_apk',
@@ -206,7 +203,7 @@
       # flake out during the test. We skip this if Telemetry is running under a
       # buildbot because build/android/test_runner.py wrapper already took care
       # of it before starting the shards.
-      test_environment.CleanupLeftoverProcesses()
+      adb.RestartAdbdOnDevice()
 
   packages = adb.RunShellCommand('pm list packages')
   possible_browsers = []