Revert "build: roll infra_paths changes"

scripts/slave/recipes/run_presubmit.expected/slave_deps.json

Index: scripts/slave/recipes/run_presubmit.expected/slave_deps.json
diff --git a/scripts/slave/recipes/run_presubmit.expected/slave_deps.json b/scripts/slave/recipes/run_presubmit.expected/slave_deps.json
index dc89e51a86e3365c5a1474f672d4f0404ffc93da..7cfe8500503f1de3c31964b69a5a8e6a748a9d6b 100644
--- a/scripts/slave/recipes/run_presubmit.expected/slave_deps.json
+++ b/scripts/slave/recipes/run_presubmit.expected/slave_deps.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'build_internal/slave.DEPS', 'url': 'https://chrome-internal.googlesource.com/chrome/tools/build/slave.DEPS.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'build_internal/slave.DEPS', 'url': 'https://chrome-internal.googlesource.com/chrome/tools/build/slave.DEPS.git'}]",
       "--root",
       "build_internal/slave.DEPS",
       "--revision_mapping_file",
       "{\"build_internal/slave.DEPS\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--issue",
       "12853011",
       "--patchset",
@@ -30,6 +30,7 @@
       "build_internal/slave.DEPS@HEAD",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -73,7 +74,7 @@
       "-m",
       "Committed patch"
     ],
-    "cwd": "[CWD]/build_internal/slave.DEPS",
+    "cwd": "[SLAVE_BUILD]/build_internal/slave.DEPS",
     "name": "commit git patch"
   },
   {
@@ -91,7 +92,7 @@
       "--rietveld_email",
       "",
       "--root",
-      "[CWD]/build_internal/slave.DEPS",
+      "[SLAVE_BUILD]/build_internal/slave.DEPS",
       "--commit",
       "--verbose",
       "--verbose",
@@ -104,6 +105,7 @@
       "--upstream",
       "a6b2a23900c876d4bcc03a18710abb26cb95996d"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },