Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/recipe_simulation.expected/normal.json

Index: scripts/slave/recipes/infra/recipe_simulation.expected/normal.json
diff --git a/scripts/slave/recipes/infra/recipe_simulation.expected/normal.json b/scripts/slave/recipes/infra/recipe_simulation.expected/normal.json
index 37432646c244badd2cc0e65fa4a257621639e5d1..72f35beba4fbfa42177b5c553e9d167078b059ed 100644
--- a/scripts/slave/recipes/infra/recipe_simulation.expected/normal.json
+++ b/scripts/slave/recipes/infra/recipe_simulation.expected/normal.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]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,6 +25,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -60,18 +61,20 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/build/scripts/slave/recipes.py",
+      "[SLAVE_BUILD]/build/scripts/slave/recipes.py",
       "fetch"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "recipe fetch deps"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/build/scripts/slave/unittests/recipe_simulation_test.py",
+      "[SLAVE_BUILD]/build/scripts/slave/unittests/recipe_simulation_test.py",
       "test"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "recipe simulation test"
   },
   {