Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win7_cr.json
diff --git a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win7_cr.json b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win7_cr.json
index 5f79ac2e9dde26a1d5ccfd996e7a7df6aded81a8..b5deac519b1f40c1f73c80575433c6ba1c748c1c 100644
--- a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win7_cr.json
+++ b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win7_cr.json
@@ -5,13 +5,13 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cp",
       "gs://chromium-drmemory-builds/drmemory-windows-latest-sfx.exe",
       "drm-sfx.exe"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil download"
   },
   {
@@ -20,7 +20,7 @@
       "-ounpacked",
       "-y"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "name": "Unpack the build"
   },
   {
@@ -28,6 +28,7 @@
       "unpacked\\bin\\drmemory",
       "-version"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Get the revision number",
     "stdout": "/path/to/tmp/"
   },
@@ -40,7 +41,7 @@
       "drmemory_light",
       "--keep_logs"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "DRMEMORY_COMMAND": "unpacked/bin/drmemory.exe"
     },
@@ -55,7 +56,7 @@
       "drmemory_light",
       "--keep_logs"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "DRMEMORY_COMMAND": "unpacked/bin/drmemory.exe"
     },
@@ -70,7 +71,7 @@
       "drmemory_light",
       "--keep_logs"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "DRMEMORY_COMMAND": "unpacked/bin/drmemory.exe"
     },
@@ -85,7 +86,7 @@
       "drmemory_light",
       "--keep_logs"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "DRMEMORY_COMMAND": "unpacked/bin/drmemory.exe"
     },
@@ -100,7 +101,7 @@
       "drmemory_light",
       "--keep_logs"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "DRMEMORY_COMMAND": "unpacked/bin/drmemory.exe"
     },
@@ -115,7 +116,7 @@
       "drmemory_light",
       "--keep_logs"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "DRMEMORY_COMMAND": "unpacked/bin/drmemory.exe"
     },
@@ -130,7 +131,7 @@
       "drmemory_light",
       "--keep_logs"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "DRMEMORY_COMMAND": "unpacked/bin/drmemory.exe"
     },
@@ -145,7 +146,7 @@
       "drmemory_light",
       "--keep_logs"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "DRMEMORY_COMMAND": "unpacked/bin/drmemory.exe"
     },
@@ -160,7 +161,7 @@
       "drmemory_light",
       "--keep_logs"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "DRMEMORY_COMMAND": "unpacked/bin/drmemory.exe"
     },
@@ -175,7 +176,7 @@
       "drmemory_light",
       "--keep_logs"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "DRMEMORY_COMMAND": "unpacked/bin/drmemory.exe"
     },