Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/cipd_test.py

Index: scripts/slave/recipes/infra/cipd_test.py
diff --git a/scripts/slave/recipes/infra/cipd_test.py b/scripts/slave/recipes/infra/cipd_test.py
index b7ab1ef01860204fca26192345acdf87984a824f..2b07ae0d4cbe2dac026349e6e37047403f937c69 100644
--- a/scripts/slave/recipes/infra/cipd_test.py
+++ b/scripts/slave/recipes/infra/cipd_test.py
@@ -13,7 +13,6 @@ DEPS = [
   'cipd',
   'file',
   'depot_tools/gclient',
-  'depot_tools/infra_paths',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
@@ -77,7 +76,7 @@ def inner(api):
   assert api.cipd.get_executable()
 
   test_package = '%s/%s' % (TEST_PACKAGE_PREFIX, api.cipd.platform_suffix())
-  test_package_file = api.infra_paths['slave_build'].join('test_package.cipd')
+  test_package_file = api.path['slave_build'].join('test_package.cipd')
   step = api.cipd.build(api.properties['dir_to_package'],
                         test_package_file,
                         test_package, install_mode='copy')
@@ -133,7 +132,7 @@ def inner(api):
   assert not unset_tags
 
   # Install test package we've just uploaded by ref.
-  cipd_root = api.infra_paths['slave_build'].join('cipd_test_package')
+  cipd_root = api.path['slave_build'].join('cipd_test_package')
   api.cipd.ensure(cipd_root, {test_package: 'latest'})
   # Someone might have changed the latest ref in the meantime,
   # so install again by exact instance_id.