Revert "build: roll infra_paths changes"

scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr.json

Index: scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr.json
diff --git a/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr.json b/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr.json
index 32fb14459d45cc785cc950830214bd00a0a87e69..28285d8d3d494a9b3ded00aa9d214a95ee92f9e1 100644
--- a/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr.json
+++ b/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlave",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]",
       "--root",
       "dynamorio",
       "--revision_mapping_file",
       "{}",
       "--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]"
     },
@@ -53,9 +54,9 @@
       "120",
       "-VV",
       "-S",
-      "[CWD]/dynamorio/suite/runsuite.cmake"
+      "[SLAVE_BUILD]/dynamorio/suite/runsuite.cmake"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "name": "pre-commit suite"
   },
   {
@@ -64,14 +65,15 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "-m",
       "----",
       "cp",
       "-r",
-      "[CWD]/install/docs/html",
+      "[SLAVE_BUILD]/install/docs/html",
       "gs://chromium-dynamorio/dr_docs/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-dynamorio/dr_docs/@@@"