Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_memcheck.json
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_memcheck.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_memcheck.json
index 7f8c555fccca05cb3f32d9416efbdb4a6a1018f3..5c33af7e4fcf5585033d85f9de9bfc0414469a31 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_memcheck.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_memcheck.json
@@ -11,13 +11,13 @@
       "--slave",
       "slavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'src/chromium/src/third_party/valgrind': 'https://chromium.googlesource.com/chromium/deps/valgrind/binaries'}, '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_deps': {'src/chromium/src/third_party/valgrind': 'https://chromium.googlesource.com/chromium/deps/valgrind/binaries'}, '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": "/creds/service_accounts/service-account-goma-client.json",
-      "GYP_DEFINES": "build_for_tool=memcheck component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1",
+      "GYP_DEFINES": "build_for_tool=memcheck 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",
       "--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",
       "/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": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -122,12 +125,13 @@
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[CWD]/src/tools/valgrind-libyuv/libyuv_tests.sh",
+      "[SLAVE_BUILD]/src/tools/valgrind-libyuv/libyuv_tests.sh",
       "--test",
       "libyuv_unittest",
       "--tool",
       "memcheck"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "libyuv_unittest"
   },
   {