Revert "build: roll infra_paths changes"

scripts/slave/recipes/webrtc/auto_roll_webrtc_deps.expected/rolling_activated.json

Index: scripts/slave/recipes/webrtc/auto_roll_webrtc_deps.expected/rolling_activated.json
diff --git a/scripts/slave/recipes/webrtc/auto_roll_webrtc_deps.expected/rolling_activated.json b/scripts/slave/recipes/webrtc/auto_roll_webrtc_deps.expected/rolling_activated.json
index 567da7aafcd56fe575c985daceed8d39cd65d8de..cdae6c57d7ecf1a230b9311299828733428aff13 100644
--- a/scripts/slave/recipes/webrtc/auto_roll_webrtc_deps.expected/rolling_activated.json
+++ b/scripts/slave/recipes/webrtc/auto_roll_webrtc_deps.expected/rolling_activated.json
@@ -3,9 +3,10 @@
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/tools/pycurl.py",
+      "[BUILD]/scripts/tools/pycurl.py",
       "https://webrtc-roll-cr-rev-status.appspot.com/status"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "check roll status",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -26,13 +27,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -40,6 +41,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -78,6 +80,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -90,7 +93,7 @@
       "-f",
       "master"
     ],
-    "cwd": "[CWD]/src",
+    "cwd": "[SLAVE_BUILD]/src",
     "name": "git checkout"
   },
   {
@@ -99,18 +102,18 @@
       "clean",
       "-ffd"
     ],
-    "cwd": "[CWD]/src",
+    "cwd": "[SLAVE_BUILD]/src",
     "name": "git clean"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/tools/autoroller/roll_chromium_revision.py",
+      "[SLAVE_BUILD]/src/tools/autoroller/roll_chromium_revision.py",
       "--clean",
       "--verbose"
     ],
-    "cwd": "[CWD]/src",
+    "cwd": "[SLAVE_BUILD]/src",
     "name": "autoroll chromium_revision"
   },
   {