Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/try_recipe.expected/recursion.json

Index: scripts/slave/recipes/infra/try_recipe.expected/recursion.json
diff --git a/scripts/slave/recipes/infra/try_recipe.expected/recursion.json b/scripts/slave/recipes/infra/try_recipe.expected/recursion.json
index f61afe4cb08acd97a72d16ee0a7543fd8db3aa22..9bbf207067fa008c6429faf43002829cb8540cec 100644
--- a/scripts/slave/recipes/infra/try_recipe.expected/recursion.json
+++ b/scripts/slave/recipes/infra/try_recipe.expected/recursion.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
       "--root",
       "build",
       "--revision_mapping_file",
       "{\"build\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--issue",
       "12853011",
       "--patchset",
@@ -31,6 +31,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -66,13 +67,15 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/build/scripts/slave/recipes.py",
+      "[SLAVE_BUILD]/build/scripts/slave/recipes.py",
       "fetch"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "fetch recipe engine deps"
   },
   {
     "cmd": [],
+    "cwd": "[SLAVE_BUILD]",
     "name": "properties (1)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@properties@{@@@",
@@ -92,17 +95,18 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/build/scripts/tools/annotee_indenter.py",
+      "[SLAVE_BUILD]/build/scripts/tools/annotee_indenter.py",
       "--base-level",
       "2",
       "--use-python-executable",
       "--",
-      "[CWD]/build/scripts/slave/recipes.py",
+      "[SLAVE_BUILD]/build/scripts/slave/recipes.py",
       "run",
       "--properties-file",
       "{\"buildername\": \"recipe_try\", \"buildnumber\": 571, \"mastername\": \"tryserver.infra\", \"slavename\": \"TestSlavename\", \"try_level\": 2, \"try_props\": \"eNqrViooyi8wVLJSUCpLzClNNVTSUQALGcGFjJRqAeKlC4s=\", \"try_recipe\": \"infra/build_repo_real_try\"}",
       "infra/try_other_recipe"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "infra.try_other_recipe run"
   },
   {