Revert "build: roll infra_paths changes"

scripts/slave/recipes/run_presubmit.py

Index: scripts/slave/recipes/run_presubmit.py
diff --git a/scripts/slave/recipes/run_presubmit.py b/scripts/slave/recipes/run_presubmit.py
index 9aefb0548c3d9da0c537b9af992b280fecb67707..ee92b65d9420c959fe2951029dce3c1d6d4b30a7 100644
--- a/scripts/slave/recipes/run_presubmit.py
+++ b/scripts/slave/recipes/run_presubmit.py
@@ -6,7 +6,6 @@ DEPS = [
   'depot_tools/bot_update',
   'depot_tools/gclient',
   'depot_tools/git',
-  'depot_tools/infra_paths',
   'depot_tools/presubmit',
   'recipe_engine/json',
   'recipe_engine/path',
@@ -41,7 +40,7 @@ def _RunStepsInternal(api):
     upstream = bot_update_step.json.output['properties'].get(
         '%s_git' % got_revision_property) or ''
 
-  abs_root = api.infra_paths['slave_build'].join(relative_root)
+  abs_root = api.path['slave_build'].join(relative_root)
   # TODO(hinoka): Extract email/name from issue?
   api.git('-c', 'user.email=commit-bot@chromium.org',
           '-c', 'user.name=The Commit Bot',
@@ -62,10 +61,10 @@ def _RunStepsInternal(api):
     if codereview_auth:
       presubmit_args.extend([
           '--rietveld_email_file',
-          api.infra_paths['build'].join('site_config', '.rietveld_client_email')])
+          api.path['build'].join('site_config', '.rietveld_client_email')])
       presubmit_args.extend([
           '--rietveld_private_key_file',
-          api.infra_paths['build'].join('site_config', '.rietveld_secret_key')])
+          api.path['build'].join('site_config', '.rietveld_secret_key')])
     else:
       presubmit_args.extend(['--rietveld_email', ''])  # activate anonymous mode
   elif patch_storage == 'gerrit':