Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/git_clone_bundler/example.expected/basic.json

Index: scripts/slave/recipe_modules/git_clone_bundler/example.expected/basic.json
diff --git a/scripts/slave/recipe_modules/git_clone_bundler/example.expected/basic.json b/scripts/slave/recipe_modules/git_clone_bundler/example.expected/basic.json
index ec73c6d033d3b7e92a1e0b685da5a53be78cdc8c..49e5a6a57481eec7a0b860ac2dade7b2a509be94 100644
--- a/scripts/slave/recipe_modules/git_clone_bundler/example.expected/basic.json
+++ b/scripts/slave/recipe_modules/git_clone_bundler/example.expected/basic.json
@@ -4,8 +4,9 @@
       "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",
-      "[CWD]/git_clone_bundler/bundles"
+      "[SLAVE_BUILD]/git_clone_bundler/bundles"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree old bundles",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -23,9 +24,10 @@
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
-      "[CWD]/git_clone_bundler/bundles",
+      "[SLAVE_BUILD]/git_clone_bundler/bundles",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs bundles",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -45,10 +47,10 @@
       "git",
       "bundle",
       "create",
-      "[CWD]/git_clone_bundler/bundles/4c11f7d238ab3a5109562560694c3722.bundle",
+      "[SLAVE_BUILD]/git_clone_bundler/bundles/4c11f7d238ab3a5109562560694c3722.bundle",
       "--all"
     ],
-    "cwd": "[CWD]/checkout",
+    "cwd": "[SLAVE_BUILD]/checkout",
     "name": "create bundle"
   },
   {
@@ -57,12 +59,13 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cp",
-      "[CWD]/git_clone_bundler/bundles/4c11f7d238ab3a5109562560694c3722.bundle",
+      "[SLAVE_BUILD]/git_clone_bundler/bundles/4c11f7d238ab3a5109562560694c3722.bundle",
       "gs://clone-dot-bundle-bucket/checkout/repository/clone.bundle"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload bundle",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil bundle@https://storage.cloud.google.com/clone-dot-bundle-bucket/checkout/repository/clone.bundle@@@"