Revert "build: roll infra_paths changes"

scripts/slave/recipes/android/perf.py

 # Copyright 2014 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.
 
 from recipe_engine.types import freeze
 
 
 DEPS = [
     'adb',
     'chromium',
     'chromium_android',
     'chromium_tests',
     'depot_tools/bot_update',
     'depot_tools/gclient',
-    'depot_tools/infra_paths',
     'recipe_engine/json',
     'recipe_engine/path',
     'recipe_engine/properties',
     'recipe_engine/python',
     'recipe_engine/step',
     'test_utils',
 ]
 
 
 REPO_URL = 'https://chromium.googlesource.com/chromium/src.git'
@@ skipping 108 matching lines @@
     test_spec = api.chromium_tests.read_test_spec(api, test_spec_file)
 
     scripts_compile_targets = \
         api.chromium_tests.get_compile_targets_for_scripts().json.output
 
     builder['tests'] = api.chromium_tests.generate_tests_from_test_spec(
         api, test_spec, builder, buildername, mastername, False, None,
         scripts_compile_targets, [api.chromium_tests.steps.generate_script],
         bot_update_step)
 
-  api.path['checkout'] = api.infra_paths['slave_build'].join('src')
+  api.path['checkout'] = api.path['slave_build'].join('src')
   api.chromium_android.clean_local_files()
 
   api.chromium_android.download_build(bucket=builder['bucket'],
     path=builder['path'](api))
 
   api.chromium_android.common_tests_setup_steps(perf_setup=True)
 
   required_apks = builder.get('required_apks', [])
   for apk in required_apks:
     api.chromium_android.adb_install_apk(apk)
@@ skipping 117 matching lines @@
           mastername='chromium.perf',
           buildername='Android Nexus5 Perf (1)',
           parent_buildername='parent_buildername',
           parent_buildnumber='1729',
           parent_revision='deadbeef',
           revision='deadbeef',
           slavename='slavename',
           target='Release') +
       api.override_step_data(
           'perf_test.foo', retcode=87))