Revert "build: roll infra_paths changes"

scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_builder_DR.json

Index: scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_builder_DR.json
diff --git a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_builder_DR.json b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_builder_DR.json
index 906a9a64a69d02c495fb3b446ce8e2019976d5b2..1f8a1e2229bc7e8f511b95b1ea1ea946c2f4a367 100644
--- a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_builder_DR.json
+++ b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_builder_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]"
     },
@@ -51,8 +52,9 @@
       "ctest",
       "-VV",
       "-S",
-      "[CWD]/dynamorio/make/package.cmake,build=0x1234567"
+      "[SLAVE_BUILD]/dynamorio/make/package.cmake,build=0x1234567"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Package DynamoRIO"
   },
   {
@@ -61,12 +63,13 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cp",
       "DynamoRIO-MacOS-*1234567.tar.gz",
       "gs://chromium-dynamorio/builds/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-dynamorio/builds/@@@"