Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_linux_linux_upload_clang.json

Index: scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_linux_linux_upload_clang.json
diff --git a/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_linux_linux_upload_clang.json b/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_linux_linux_upload_clang.json
index 7eaba80a5d9c5254015b8dccea55e5163bf08c12..8fa25b250f2cff807e7f601b8b1e55e27aff11db 100644
--- a/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_linux_linux_upload_clang.json
+++ b/scripts/slave/recipes/chromium_upload_clang.expected/full_tryserver_chromium_linux_linux_upload_clang.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--issue",
       "12853011",
       "--patchset",
@@ -31,6 +31,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -106,17 +107,19 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/third_party/binutils/download.py"
+      "[SLAVE_BUILD]/src/third_party/binutils/download.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "download binutils"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/tools/clang/scripts/package.py",
+      "[SLAVE_BUILD]/src/tools/clang/scripts/package.py",
       "--upload"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "package clang"
   },
   {