build: roll infra_paths changes

scripts/slave/recipes/catapult.expected/basic.json

Index: scripts/slave/recipes/catapult.expected/basic.json
diff --git a/scripts/slave/recipes/catapult.expected/basic.json b/scripts/slave/recipes/catapult.expected/basic.json
index c4b9d74bed7c5f29092b5b357a616a85b2576545..465f24591b4d64f2785e60e2b5a1dc71463d9718 100644
--- a/scripts/slave/recipes/catapult.expected/basic.json
+++ b/scripts/slave/recipes/catapult.expected/basic.json
@@ -11,13 +11,13 @@
       "--slave",
       "windows_slave",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'catapult', 'url': 'https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git'}]",
+      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'catapult', 'url': 'https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git'}]",
       "--root",
       "catapult",
       "--revision_mapping_file",
       "{\"catapult\": \"got_revision\"}",
       "--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]"
     },
@@ -64,7 +63,6 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -82,7 +80,6 @@
       "--format",
       "text"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "Fetch SDK downloader"
   },
   {
@@ -92,7 +89,6 @@
       "\"<simulated contents of get_appengine.py>\"",
       "--dest=."
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "Run SDK downloader",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@\"<simulated contents of get_appengine.py>\"@@@",
@@ -103,17 +99,17 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/catapult/catapult_build/build_steps.py",
+      "[CWD]/catapult/catapult_build/build_steps.py",
       "--api-path-checkout",
-      "[SLAVE_BUILD]/catapult",
+      "[CWD]/catapult",
       "--app-engine-sdk-pythonpath",
-      "%(PYTHONPATH)s:[SLAVE_BUILD]/google_appengine",
+      "%(PYTHONPATH)s:[CWD]/google_appengine",
       "--platform",
       "linux",
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]/catapult",
+    "cwd": "[CWD]/catapult",
     "name": "gen step(build_steps.py)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@[@@@",