Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/run_presubmit.expected/build.json
diff --git a/scripts/slave/recipes/run_presubmit.expected/build.json b/scripts/slave/recipes/run_presubmit.expected/build.json
index cc3c408f289ebbfd1f6471db4fe16ada27c012ca..c8902144458e68872266e0dba713919b8102b09c 100644
--- a/scripts/slave/recipes/run_presubmit.expected/build.json
+++ b/scripts/slave/recipes/run_presubmit.expected/build.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",
@@ -30,6 +30,7 @@
       "build@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",
+    "cwd": "[SLAVE_BUILD]/build",
     "name": "commit git patch"
   },
   {
@@ -91,7 +92,7 @@
       "--rietveld_email",
       "",
       "--root",
-      "[CWD]/build",
+      "[SLAVE_BUILD]/build",
       "--commit",
       "--verbose",
       "--verbose",
@@ -104,6 +105,7 @@
       "--upstream",
       "80754af91bfb6d1073585b046fe0a474ce868509"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "PYTHONPATH": ""