[Telemetry] Reorganize everything.

tools/telemetry/telemetry/core/chrome/android_browser_finder.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.
 """Finds android browsers that can be controlled by telemetry."""
 
 import os
 import logging as real_logging
 import re
 import subprocess
 import sys
 
-from telemetry import adb_commands
-from telemetry import android_browser_backend
-from telemetry import android_platform
-from telemetry import browser
-from telemetry import possible_browser
+from telemetry.core import browser
+from telemetry.core import possible_browser
+from telemetry.core.chrome import adb_commands
+from telemetry.core.chrome import android_browser_backend
+from telemetry.core.chrome import android_platform
 
 CHROME_PACKAGE_NAMES = {
   'android-chrome': 'com.google.android.apps.chrome',
   'android-chrome-beta': 'com.chrome.beta',
   'android-chrome-dev': 'com.google.android.apps.chrome_dev',
   'android-jb-system-chrome': 'com.android.chrome'
 }
 
 ALL_BROWSER_TYPES = ','.join(['android-content-shell'] +
                              CHROME_PACKAGE_NAMES.keys())
@@ skipping 52 matching lines @@
                               stdin=devnull)
       stdout, _ = proc.communicate()
       if re.search(re.escape('????????????\tno permissions'), stdout) != None:
         logging.warn(
             ('adb devices reported a permissions error. Consider '
             'restarting adb as root:'))
         logging.warn('  adb kill-server')
         logging.warn('  sudo `which adb` devices\n\n')
   except OSError:
     platform_tools_path = os.path.join(
-        os.path.dirname(__file__), '..', '..', '..',
+        os.path.dirname(__file__), '..', '..', '..', '..', '..'
         'third_party', 'android_tools', 'sdk', 'platform-tools')
     if (sys.platform.startswith('linux') and
         os.path.exists(os.path.join(platform_tools_path, 'adb'))):
       os.environ['PATH'] = os.pathsep.join([platform_tools_path,
                                             os.environ['PATH']])
     else:
       logging.info('No adb command found. ' +
                    'Will not try searching for Android browsers.')
       return []
 
@@ skipping 41 matching lines @@
   # but make it accessible to the device.
   if len(possible_browsers) and not adb_commands.HasForwarder():
     logging.warn('telemetry detected an android device. However,')
     logging.warn('Chrome\'s port-forwarder app is not available.')
     logging.warn('To build:')
     logging.warn('  make -j16 host_forwarder device_forwarder')
     logging.warn('')
     logging.warn('')
     return []
   return possible_browsers