Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium.gpu.recipe_autogen.expected/Android_Debug__Nexus_6_.json

Index: scripts/slave/recipes/chromium.gpu.recipe_autogen.expected/Android_Debug__Nexus_6_.json
diff --git a/scripts/slave/recipes/chromium.gpu.recipe_autogen.expected/Android_Debug__Nexus_6_.json b/scripts/slave/recipes/chromium.gpu.recipe_autogen.expected/Android_Debug__Nexus_6_.json
index 4f35fa087401bac488da70a7823dd7acd88b0913..81efc46e8d2a7dbcd5ef3018f6688ccc965587c3 100644
--- a/scripts/slave/recipes/chromium.gpu.recipe_autogen.expected/Android_Debug__Nexus_6_.json
+++ b/scripts/slave/recipes/chromium.gpu.recipe_autogen.expected/Android_Debug__Nexus_6_.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlave",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'src/third_party/WebKit/LayoutTests': None}, 'custom_vars': {'googlecode_url': 'http://%s.googlecode.com/svn', 'llvm_url': 'http://llvm.org/svn/llvm-project', 'nacl_trunk': 'http://src.chromium.org/native_client/trunk', 'sourceforge_url': 'https://svn.code.sf.net/p/%(repo)s/code', 'webkit_trunk': 'http://src.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['android']",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'src/third_party/WebKit/LayoutTests': None}, 'custom_vars': {'googlecode_url': 'http://%s.googlecode.com/svn', 'llvm_url': 'http://llvm.org/svn/llvm-project', 'nacl_trunk': 'http://src.chromium.org/native_client/trunk', 'sourceforge_url': 'https://svn.code.sf.net/p/%(repo)s/code', 'webkit_trunk': 'http://src.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['android']",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/third_party/WebKit\": \"got_webkit_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]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,6 +25,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -84,10 +85,11 @@
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/gclient_safe_revert.py",
+      "[BUILD]/scripts/slave/gclient_safe_revert.py",
       ".",
-      "[ROOT]/b/depot_tools/gclient"
+      "[DEPOT_TOOLS]/gclient"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gclient revert"
   },
   {
@@ -99,6 +101,7 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
@@ -110,6 +113,7 @@
       "--build-properties={\"buildername\":\"Android Debug (Nexus 6)\",\"mastername\":\"chromium.gpu\",\"recipe\":\"chromium.gpu.recipe_autogen\",\"slavename\":\"TestSlave\"}",
       "--factory-properties={\"GYP_DEFINES\":\" component=shared_library\",\"android_bot_id\":\"gpu-builder-tests-dbg\",\"clobber\":false,\"gclient_env\":{},\"gclient_timeout\":3600,\"target\":\"Debug\",\"target_os\":\"android\"}"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "slave_steps"
   },
   {