[Telemetry] Remove usage of adb_commands in android_command_line_backend and android_browser_finder

tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.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.
 
 """Finds android browsers that can be controlled by telemetry."""
 
 import logging
 import os
 
 from telemetry.core import browser
 from telemetry.core import exceptions
 from telemetry.core import platform
 from telemetry.core.platform import android_device
 from telemetry.core import possible_browser
 from telemetry.core import util
 from telemetry import decorators
-from telemetry.internal.backends import adb_commands
 from telemetry.internal.backends import android_browser_backend_settings
 from telemetry.internal.backends.chrome import android_browser_backend
 
+util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
+from pylib.utils import apk_helper # pylint: disable=import-error
+
 
 CHROME_PACKAGE_NAMES = {
   'android-content-shell':
       ['org.chromium.content_shell_apk',
        android_browser_backend_settings.ContentShellBackendSettings,
        'ContentShell.apk'],
   'android-chrome-shell':
       ['org.chromium.chrome.shell',
        android_browser_backend_settings.ChromeShellBackendSettings,
        'ChromeShell.apk'],
@@ skipping 132 matching lines @@
   """Testable version of FindAllAvailableBrowsers."""
   if not android_platform:
     return []
   possible_browsers = []
 
   # Add the exact APK if given.
   if (finder_options.browser_executable and
       CanPossiblyHandlePath(finder_options.browser_executable)):
     normalized_path = os.path.expanduser(finder_options.browser_executable)
 
-    exact_package = adb_commands.GetPackageName(normalized_path)
+    exact_package = apk_helper.GetPackageName(normalized_path)
     if not exact_package:
       raise exceptions.PackageDetectionError(
           'Unable to find package for %s specified by --browser-executable' %
           normalized_path)
 
     package_info = next((info for info in CHROME_PACKAGE_NAMES.itervalues()
                          if info[0] == exact_package), None)
     if package_info:
       [package, backend_settings, _] = package_info
       possible_browsers.append(
@@ skipping 23 matching lines @@
 def FindAllAvailableBrowsers(finder_options, device):
   """Finds all the possible browsers on one device.
 
   The device is either the only device on the host platform,
   or |finder_options| specifies a particular device.
   """
   if not isinstance(device, android_device.AndroidDevice):
     return []
   android_platform = platform.GetPlatformForDevice(device, finder_options)
   return _FindAllPossibleBrowsers(finder_options, android_platform)