Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/recipe_autoroller_public.expected/failed_upload.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]"
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient setup"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "sync",
       "--verbose",
       "--with_branch_heads",
       "--nohooks",
       "-j8",
       "--reset",
       "--force",
       "--upstream",
       "--no-nag-max",
       "--delete_unversioned_trees",
       "--revision",
       "infra@origin/master",
       "--revision",
       "infra/recipes-py@origin/master",
       "--output-json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"solutions\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"infra/\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
@@ skipping 10 matching lines @@
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "recurse",
       "git",
       "config",
       "user.name",
       "local_bot"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient recurse (git config user.name)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "recurse",
       "git",
       "config",
       "user.email",
       "local_bot@example.com"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient recurse (git config user.email)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/tools/pycurl.py",
       "https://luci-config.appspot.com/_ah/api/config/v1/projects",
       "--outfile",
       "/path/to/tmp/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Get luci-config projects"
   },
   {
     "cmd": [],
+    "cwd": "[SLAVE_BUILD]",
     "name": "build"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
-      "[TMP]/roll_build_tmp_1",
+      "[TMP_BASE]/roll_build_tmp_1",
       "--url",
       "https://repo.repo/build"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "build.git setup",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "retry",
       "fetch",
       "origin",
       "master"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.git fetch",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "checkout",
       "-f",
       "FETCH_HEAD"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.git checkout",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "clean",
       "-f",
       "-d",
       "-x"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.git clean",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "config",
       "user.email",
       "recipe-roller@chromium.org"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.git config",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "config",
       "user.name",
       "recipe-roller"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.git config (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "checkout",
       "-t",
       "-b",
       "roll",
       "origin/master"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.git checkout (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
-      "[CWD]/infra/ENV/bin/python",
+      "[SLAVE_BUILD]/infra/ENV/bin/python",
       "-u",
-      "[CWD]/infra/recipes-py/recipes.py",
+      "[SLAVE_BUILD]/infra/recipes-py/recipes.py",
       "--package",
-      "[TMP]/roll_build_tmp_1/infra/config/recipes.cfg",
+      "[TMP_BASE]/roll_build_tmp_1/infra/config/recipes.cfg",
       "autoroll",
       "--output-json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "build.roll",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_TEXT@ (trivial)@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"picked_roll_details\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"commit_infos\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"recipe_engine\": [@@@",
       "@@@STEP_LOG_LINE@json.output@        {@@@",
       "@@@STEP_LOG_LINE@json.output@          \"author\": \"foo@chromium.org\", @@@",
@@ skipping 29 matching lines @@
     ]
   },
   {
     "cmd": [
       "git",
       "commit",
       "-a",
       "-m",
       "roll recipes.cfg"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.git commit",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "show",
       "--format=%b"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.git show",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@output@-some line@@@",
       "@@@STEP_LOG_LINE@output@+some other line@@@",
       "@@@STEP_LOG_END@output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cat",
       "gs://recipe-roller-cl-uploads/8e9377cb1551d1353f8f1103e01bd5bf"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "build.gsutil cat",
     "stderr": "/path/to/tmp/",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@stderr@Error: No URLs matched ...@@@",
       "@@@STEP_LOG_END@stderr@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "cl",
       "upload",
       "--use-commit-queue",
       "--bypass-hooks",
       "-f",
       "-m",
       "Roll recipe dependencies (trivial).\n\nThis is an automated CL created by the recipe roller. This CL rolls recipe\nchanges from upstream projects (e.g. depot_tools) into downstream projects\n(e.g. tools/build).\n\n\nMore info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug\n(or complain)\n\nrecipe_engine:\n  https://crrev.com/123abc some commit message (foo@chromium.org)\n\nR=foo@chromium.org,bar@chromium.org,baz@chromium.org\nBUG=123,456\n\nTBR=martiniss@chromium.org,phajdan.jr@chromium.org\n",
       "--auth-refresh-token-json=/creds/refresh_tokens/recipe-roller"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.git cl upload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "cl",
       "issue"
     ],
-    "cwd": "[TMP]/roll_build_tmp_1",
+    "cwd": "[TMP_BASE]/roll_build_tmp_1",
     "name": "build.git cl issue",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(1)"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "build.git cl upload failed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@git cl issue output \"Issue number: None (None)\" is not valid@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil, sys\nshutil.rmtree(sys.argv[1])\n",
-      "[TMP]/roll_build_tmp_1"
+      "[TMP_BASE]/roll_build_tmp_1"
     ],
-    "name": "build.rmtree [TMP]/roll_build_tmp_1",
+    "cwd": "[SLAVE_BUILD]",
+    "name": "build.rmtree [TMP_BASE]/roll_build_tmp_1",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import shutil, sys@@@",
       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1])@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
     "reason": "1 out of 2 aggregated steps failed. Failures: Step('build.git cl upload failed') failed with return_code 1",
     "status_code": 1
   }
 ]