build: roll infra_paths changes

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

Index: scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_8_dr.json
diff --git a/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_8_dr.json b/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_8_dr.json
index b4c99800588da303da53ce8a09b1664e614607d7..e9e8061f0b322ef10343d49ad3e68a9517201a46 100644
--- a/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_8_dr.json
+++ b/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_8_dr.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlave",
       "--spec",
-      "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'}]",
+      "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'}]",
       "--root",
       "dynamorio",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
-      "[GIT_CACHE]",
+      "[ROOT]/b/build/slave/cache_dir",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,7 +25,6 @@
       "--force",
       "--output_manifest"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -49,24 +48,24 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/dynamorio/tools/buildbot/bot_tools/unpack.bat"
+      "[CWD]/dynamorio/tools/buildbot/bot_tools/unpack.bat"
     ],
-    "cwd": "[SLAVE_BUILD]/dynamorio/tools/buildbot/bot_tools",
+    "cwd": "[CWD]/dynamorio/tools/buildbot/bot_tools",
     "name": "unpack tools"
   },
   {
     "cmd": [
-      "[BUILD]/scripts/slave/drmemory/build_env.bat",
+      "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
       "ctest",
       "--timeout",
       "120",
       "-VV",
       "-S",
-      "[SLAVE_BUILD]/dynamorio/suite/runsuite.cmake"
+      "[CWD]/dynamorio/suite/runsuite.cmake"
     ],
-    "cwd": "[SLAVE_BUILD]",
+    "cwd": "[CWD]",
     "env": {
-      "BOTTOOLS": "[SLAVE_BUILD]/dynamorio/tools/buildbot/bot_tools"
+      "BOTTOOLS": "[CWD]/dynamorio/tools/buildbot/bot_tools"
     },
     "name": "pre-commit suite"
   },