Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_mavericks_x64_drm.json
diff --git a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_mavericks_x64_drm.json b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_mavericks_x64_drm.json
index 28342092818f7dad15b7fa3040fff3a82022c2bc..a9751b081bcb90b3fdec7111393375793ebea73a 100644
--- a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_mavericks_x64_drm.json
+++ b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/mac_mavericks_x64_drm.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]"
     },
@@ -53,8 +54,9 @@
       "60",
       "-VV",
       "-S",
-      "[CWD]/drmemory/tests/runsuite.cmake,drmemory_only;long;build=0x1234567"
+      "[SLAVE_BUILD]/drmemory/tests/runsuite.cmake,drmemory_only;long;build=0x1234567"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Dr. Memory ctest"
   },
   {
@@ -69,6 +71,7 @@
       "build_drmemory-rel-32/Testing/Temporary",
       "xml:results"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Pack test results"
   },
   {
@@ -77,12 +80,13 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cp",
       "testlogs_r123456789abcdef_b42.7z",
       "gs://chromium-drmemory-builds/testlogs/from_mac-mavericks_x64-drm"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-drmemory-builds/testlogs/from_mac-mavericks_x64-drm@@@"