build: roll infra_paths changes

scripts/slave/recipes/infra/depot_tools_builder.expected/basic.json

Index: scripts/slave/recipes/infra/depot_tools_builder.expected/basic.json
diff --git a/scripts/slave/recipes/infra/depot_tools_builder.expected/basic.json b/scripts/slave/recipes/infra/depot_tools_builder.expected/basic.json
index 3833bd1d46e679406e4452941c0e317a7e80c9a2..57a41ac9f6517780f20ea8798a53c20e85256b7e 100644
--- a/scripts/slave/recipes/infra/depot_tools_builder.expected/basic.json
+++ b/scripts/slave/recipes/infra/depot_tools_builder.expected/basic.json
@@ -1,7 +1,6 @@
 [
   {
     "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
     "name": "clean workspace"
   },
   {
@@ -9,9 +8,8 @@
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
-      "[SLAVE_BUILD]/depot_tools"
+      "[CWD]/depot_tools"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "clean workspace.rmtree rm depot_tools",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
@@ -30,9 +28,8 @@
       "python",
       "-u",
       "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
-      "[SLAVE_BUILD]/depot_tools.zip"
+      "[CWD]/depot_tools.zip"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "clean workspace.rm depot_tools.zip",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
@@ -46,9 +43,8 @@
   {
     "cmd": [
       "mkdir",
-      "[SLAVE_BUILD]/depot_tools"
+      "[CWD]/depot_tools"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "clean workspace.mk depot_tools",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -56,7 +52,6 @@
   },
   {
     "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
     "name": "clone + checkout"
   },
   {
@@ -66,9 +61,9 @@
       "--single-branch",
       "-n",
       "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-      "[SLAVE_BUILD]/depot_tools"
+      "[CWD]/depot_tools"
     ],
-    "cwd": "[SLAVE_BUILD]/depot_tools",
+    "cwd": "[CWD]/depot_tools",
     "name": "clone + checkout.git clone",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -81,7 +76,7 @@
       "core.autocrlf",
       "false"
     ],
-    "cwd": "[SLAVE_BUILD]/depot_tools",
+    "cwd": "[CWD]/depot_tools",
     "name": "clone + checkout.set autocrlf",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -94,7 +89,7 @@
       "core.filemode",
       "false"
     ],
-    "cwd": "[SLAVE_BUILD]/depot_tools",
+    "cwd": "[CWD]/depot_tools",
     "name": "clone + checkout.set filemode",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -107,7 +102,7 @@
       "core.symlinks",
       "false"
     ],
-    "cwd": "[SLAVE_BUILD]/depot_tools",
+    "cwd": "[CWD]/depot_tools",
     "name": "clone + checkout.set symlinks",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -119,7 +114,7 @@
       "checkout",
       "origin/master"
     ],
-    "cwd": "[SLAVE_BUILD]/depot_tools",
+    "cwd": "[CWD]/depot_tools",
     "name": "clone + checkout.git checkout",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -132,7 +127,7 @@
       "--hard",
       "deadbeef"
     ],
-    "cwd": "[SLAVE_BUILD]/depot_tools",
+    "cwd": "[CWD]/depot_tools",
     "name": "clone + checkout.git reset",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -145,7 +140,7 @@
       "expire",
       "--all"
     ],
-    "cwd": "[SLAVE_BUILD]/depot_tools",
+    "cwd": "[CWD]/depot_tools",
     "name": "clone + checkout.git reflog",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -158,7 +153,7 @@
       "--aggressive",
       "--prune=all"
     ],
-    "cwd": "[SLAVE_BUILD]/depot_tools",
+    "cwd": "[CWD]/depot_tools",
     "name": "clone + checkout.git gc",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -170,9 +165,8 @@
       "-u",
       "RECIPE_MODULE[build::zip]/resources/zip.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "zip it up",
-    "stdin": "{\"entries\": [{\"path\": \"[SLAVE_BUILD]/depot_tools\", \"type\": \"dir\"}], \"output\": \"[SLAVE_BUILD]/depot_tools.zip\", \"root\": \"[SLAVE_BUILD]/depot_tools\"}"
+    "stdin": "{\"entries\": [{\"path\": \"[CWD]/depot_tools\", \"type\": \"dir\"}], \"output\": \"[CWD]/depot_tools.zip\", \"root\": \"[CWD]/depot_tools\"}"
   },
   {
     "cmd": [
@@ -180,15 +174,14 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[DEPOT_TOOLS]/gsutil.py",
+      "[ROOT]/b/depot_tools/gsutil.py",
       "----",
       "cp",
       "-a",
       "public-read",
-      "[SLAVE_BUILD]/depot_tools.zip",
+      "[CWD]/depot_tools.zip",
       "gs://chrome-infra/depot_tools.zip"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.googleapis.com/chrome-infra/depot_tools.zip@@@"
@@ -200,7 +193,7 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[DEPOT_TOOLS]/gsutil.py",
+      "[ROOT]/b/depot_tools/gsutil.py",
       "----",
       "cp",
       "-r",
@@ -208,10 +201,9 @@
       "html",
       "-a",
       "public-read",
-      "[SLAVE_BUILD]/depot_tools/man/html",
+      "[CWD]/depot_tools/man/html",
       "gs://chrome-infra-docs/flat/depot_tools/docs/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload docs"
   },
   {