[Android] Prepare build/android/ for catapult+devil.

build/android/pylib/instrumentation/setup.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.
 
 """Generates test runner factory and tests for instrumentation tests."""
 
 import logging
 import os
 
 from devil.android import device_utils
-from pylib import constants
 from pylib import valgrind_tools
 from pylib.base import base_setup
+from pylib.constants import host_paths
 from pylib.instrumentation import test_package
 from pylib.instrumentation import test_runner
 
 DEVICE_DATA_DIR = 'chrome/test/data'
 
 ISOLATE_FILE_PATHS = {
     'AndroidWebViewTest': 'android_webview/android_webview_test_apk.isolate',
     'ContentShellTest': 'content/content_shell_test_apk.isolate',
 }
 
 DEPS_EXCLUSION_LIST = []
 
 # TODO(mikecase): Remove this function and the constant DEVICE_DATA_DIR
 # once all data deps are pushed to the same location on the device.
 def _PushExtraSuiteDataDeps(device, test_apk):
   """Pushes some extra data files/dirs needed by some test suite.
 
   Args:
     test_apk: The test suite basename for which to return file paths.
   """
   if test_apk in ['ChromeTest', 'ContentShellTest',
                   'CronetTestInstrumentation']:
     test_files = 'net/data/ssl/certificates'
     host_device_file_tuple = [
-        (os.path.join(constants.DIR_SOURCE_ROOT, test_files),
+        (os.path.join(host_paths.DIR_SOURCE_ROOT, test_files),
          os.path.join(device.GetExternalStoragePath(), test_files))]
     device.PushChangedFiles(host_device_file_tuple)
 
 
 # TODO(mikecase): Remove this function once everything uses
 # base_setup.PushDataDeps to push data deps to the device.
 def _PushDataDeps(device, test_options):
   valgrind_tools.PushFilesForTool(test_options.tool, device)
 
   host_device_file_tuples = []
   for dest_host_pair in test_options.test_data:
     dst_src = dest_host_pair.split(':', 1)
     dst_layer = dst_src[0]
     host_src = dst_src[1]
-    host_test_files_path = os.path.join(constants.DIR_SOURCE_ROOT, host_src)
+    host_test_files_path = os.path.join(host_paths.DIR_SOURCE_ROOT, host_src)
     if os.path.exists(host_test_files_path):
       host_device_file_tuples += [(
           host_test_files_path,
           '%s/%s/%s' % (
               device.GetExternalStoragePath(),
               DEVICE_DATA_DIR,
               dst_layer))]
   if host_device_file_tuples:
     device.PushChangedFiles(host_device_file_tuples)
 
@@ skipping 42 matching lines @@
       isolator.Clear()
 
   device_utils.DeviceUtils.parallel(devices).pMap(
       _PushExtraSuiteDataDeps, test_options.test_apk)
 
   def TestRunnerFactory(device, shard_index):
     return test_runner.TestRunner(test_options, device, shard_index,
                                   test_pkg)
 
   return (TestRunnerFactory, tests)