Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_dr_package.json
diff --git a/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_dr_package.json b/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_dr_package.json
index d9797340d41e438f5abafd84f3c99eb439a61b35..05768d8a41eee0aa6d75eafabcd5f7c7d1c132cd 100644
--- a/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_dr_package.json
+++ b/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_dr_package.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlave",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'dynamorio/tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'dynamorio/tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, '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]"
     },
@@ -48,21 +49,22 @@
   },
   {
     "cmd": [
-      "[CWD]/dynamorio/tools/buildbot/bot_tools/unpack.bat"
+      "[SLAVE_BUILD]/dynamorio/tools/buildbot/bot_tools/unpack.bat"
     ],
-    "cwd": "[CWD]/dynamorio/tools/buildbot/bot_tools",
+    "cwd": "[SLAVE_BUILD]/dynamorio/tools/buildbot/bot_tools",
     "name": "unpack tools"
   },
   {
     "cmd": [
-      "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+      "[BUILD]/scripts/slave/drmemory/build_env.bat",
       "ctest",
       "-VV",
       "-S",
-      "[CWD]/dynamorio/make/package.cmake,build=0x1234567"
+      "[SLAVE_BUILD]/dynamorio/make/package.cmake,build=0x1234567"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "BOTTOOLS": "[CWD]/dynamorio/tools/buildbot/bot_tools"
+      "BOTTOOLS": "[SLAVE_BUILD]/dynamorio/tools/buildbot/bot_tools"
     },
     "name": "Package DynamoRIO"
   },
@@ -72,12 +74,13 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cp",
       "DynamoRIO-Windows-*1234567.zip",
       "gs://chromium-dynamorio/builds/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-dynamorio/builds/@@@"