Revert "build: roll infra_paths changes"

scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_rel.json

Index: scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_rel.json
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_rel.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_rel.json
index cce2617b19df81ea3fcdeaef68f16648018dad90..0944459693ce0caca3153762d1d9993ca2ab5f29 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_rel.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_rel.json
@@ -11,13 +11,13 @@
       "--slave",
       "slavename",
       "--spec",
-      "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
-      "[ROOT]\\b\\build\\slave\\cache_dir",
+      "[GIT_CACHE]",
       "--patch_url",
       "try_job_svn_patch",
       "--output_json",
@@ -27,6 +27,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -55,9 +56,10 @@
       "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
-      "GYP_DEFINES": "chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]\\b\\build\\goma' target_arch=x64 use_goma=1",
+      "GYP_DEFINES": "chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]\\goma' target_arch=x64 use_goma=1",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
@@ -77,9 +79,9 @@
       "--target",
       "Release_x64",
       "--src-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--goma-cache-dir",
-      "[ROOT]\\b\\build\\slave\\goma_cache",
+      "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--compiler",
@@ -89,12 +91,13 @@
       "--goma-service-account-json-file",
       "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "--goma-dir",
-      "[ROOT]\\b\\build\\goma",
+      "[BUILD]\\goma",
       "--goma-fail-fast",
       "--goma-disable-local-fallback",
       "--",
       "All"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
@@ -120,6 +123,7 @@
       "--slave-name=slavename",
       "libyuv_unittest.exe"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "libyuv_unittest"
   },
   {