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

build/android/pylib/instrumentation/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.
 
 """Class for running instrumentation tests on a single device."""
 
 import collections
 import logging
 import os
 import re
-import sys
 import time
 
 from devil.android import device_errors
 from pylib import constants
 from pylib import flag_changer
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
+from pylib.constants import host_paths
 from pylib.instrumentation import instrumentation_test_instance
 from pylib.instrumentation import json_perf_parser
 from pylib.instrumentation import test_result
 from pylib.local.device import local_device_instrumentation_test_run
 
-sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib',
-                             'common'))
-import perf_tests_results_helper # pylint: disable=F0401
+with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
+  import perf_tests_results_helper # pylint: disable=import-error
 
 
 _PERF_TEST_ANNOTATION = 'PerfTest'
 
 
 class TestRunner(base_test_runner.BaseTestRunner):
   """Responsible for running a series of tests connected to a single device."""
 
   _DEVICE_COVERAGE_DIR = 'chrome/test/coverage'
   _HOSTMACHINE_PERF_OUTPUT_FILE = '/tmp/chrome-profile'
@@ skipping 64 matching lines @@
     else:
       if self.device.SetJavaAsserts(self.options.set_asserts):
         self.device.RunShellCommand('stop')
         self.device.RunShellCommand('start')
         self.device.WaitUntilFullyBooted()
 
     # We give different default value to launch HTTP server based on shard index
     # because it may have race condition when multiple processes are trying to
     # launch lighttpd with same port at same time.
     self.LaunchTestHttpServer(
-        os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
+        os.path.join(host_paths.DIR_SOURCE_ROOT), self._lighttp_port)
     if self.flags:
       flags_to_add = ['--disable-fre', '--enable-test-intents']
       if self.options.device_flags:
         with open(self.options.device_flags) as device_flags_file:
           stripped_flags = (l.strip() for l in device_flags_file)
           flags_to_add.extend([flag for flag in stripped_flags if flag])
       self.flags.AddFlags(flags_to_add)
 
   def TearDown(self):
     """Cleans up the test harness and saves outstanding data from test run."""
@@ skipping 288 matching lines @@
             result_name, ' '.join(flag_modifiers.add))
         if flag_modifiers.remove:
           result_name = '%s without {%s}' % (
             result_name, ' '.join(flag_modifiers.remove))
         result.SetName(result_name)
       results.AddResult(result)
 
       self.TestTeardown(test, results)
 
     return (results, None if results.DidRunPass() else test)