Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_builder.json
diff --git a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_builder.json b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_builder.json
index 851209deaf6ceb859c67f00bbc4c75bb40e9f8ad..dc87ea5c8904cb1e550ffb0a50527f2b1104e1df 100644
--- a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_builder.json
+++ b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_builder.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlave",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'drmemory/dynamorio': 'https://github.com/DynamoRIO/dynamorio.git', 'tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'drmemory', 'url': 'https://github.com/DynamoRIO/drmemory.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'drmemory/dynamorio': 'https://github.com/DynamoRIO/dynamorio.git', 'tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'drmemory', 'url': 'https://github.com/DynamoRIO/drmemory.git'}]",
       "--root",
       "drmemory",
       "--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,22 +49,22 @@
   },
   {
     "cmd": [
-      "[CWD]/tools/buildbot/bot_tools/unpack.bat"
+      "[SLAVE_BUILD]/tools/buildbot/bot_tools/unpack.bat"
     ],
-    "cwd": "[CWD]/tools/buildbot/bot_tools",
+    "cwd": "[SLAVE_BUILD]/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]/drmemory/package.cmake,build=0x1234567;drmem_only"
+      "[SLAVE_BUILD]/drmemory/package.cmake,build=0x1234567;drmem_only"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+      "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
     },
     "name": "Package Dr. Memory"
   },
@@ -75,7 +76,7 @@
       "/B",
       "DrMemory-Windows-*0x1234567.zip"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "name": "Find package basename",
     "stdout": "/path/to/tmp/"
   },
@@ -84,8 +85,9 @@
       "python",
       "-u",
       "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
-      "[CWD]/DrMemory-Windows-1.2.3-0x1234567-sfx.exe"
+      "[SLAVE_BUILD]/DrMemory-Windows-1.2.3-0x1234567-sfx.exe"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Delete prior sfx archive",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -97,16 +99,16 @@
   },
   {
     "cmd": [
-      "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+      "[BUILD]/scripts/slave/drmemory/build_env.bat",
       "7z",
       "a",
       "-sfx",
       "DrMemory-Windows-1.2.3-0x1234567-sfx.exe",
       "build_drmemory-debug-32\\_CPack_Packages\\Windows\\ZIP\\DrMemory-Windows-1.2.3-0x1234567\\*"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+      "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
     },
     "name": "create sfx archive"
   },
@@ -115,9 +117,10 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]/DrMemory-Windows-1.2.3-0x1234567-sfx.exe",
-      "[CWD]/drmemory-windows-latest-sfx.exe"
+      "[SLAVE_BUILD]/DrMemory-Windows-1.2.3-0x1234567-sfx.exe",
+      "[SLAVE_BUILD]/drmemory-windows-latest-sfx.exe"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "copy locally"
   },
   {
@@ -126,13 +129,13 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cp",
       "drmemory-windows-latest-sfx.exe",
       "gs://chromium-drmemory-builds/"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-drmemory-builds/@@@"
@@ -144,12 +147,13 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cp",
       "DrMemory-Windows-*1234567.zip",
       "gs://chromium-drmemory-builds/builds/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload (2)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-drmemory-builds/builds/@@@"