Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/master_manager_config.expected/master_manager_config.json

Index: scripts/slave/recipes/infra/master_manager_config.expected/master_manager_config.json
diff --git a/scripts/slave/recipes/infra/master_manager_config.expected/master_manager_config.json b/scripts/slave/recipes/infra/master_manager_config.expected/master_manager_config.json
index 8653e11b5f2c66584852eead0ed15aaa818ae2f8..a4d1ebebfa1ff19a84d5d10764f7f14ebaa767f1 100644
--- a/scripts/slave/recipes/infra/master_manager_config.expected/master_manager_config.json
+++ b/scripts/slave/recipes/infra/master_manager_config.expected/master_manager_config.json
@@ -11,17 +11,17 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra_internal', 'url': 'https://chrome-internal.googlesource.com/infra/infra_internal.git'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra-data-master-manager', 'url': 'https://chrome-internal.googlesource.com/infradata/master-manager.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra_internal', 'url': 'https://chrome-internal.googlesource.com/infra/infra_internal.git'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra-data-master-manager', 'url': 'https://chrome-internal.googlesource.com/infradata/master-manager.git'}]",
       "--root",
       "infra-data-master-manager",
       "--revision_mapping_file",
       "{\"infra-data-master-manager\": \"got_revision\", \"infra_internal\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--apply_issue_email_file",
-      "[ROOT]/b/build/site_config/.rietveld_client_email",
+      "[BUILD]/site_config/.rietveld_client_email",
       "--apply_issue_key_file",
-      "[ROOT]/b/build/site_config/.rietveld_secret_key",
+      "[BUILD]/site_config/.rietveld_secret_key",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -29,6 +29,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -71,6 +72,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -80,13 +82,14 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/infra/run.py",
+      "[SLAVE_BUILD]/infra/run.py",
       "infra.services.master_manager_launcher",
       "--verify",
       "--ts-mon-endpoint=none",
       "--json-file",
-      "[CWD]/infra-data-master-manager/desired_master_state.json"
+      "[SLAVE_BUILD]/infra-data-master-manager/desired_master_state.json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "master manager configuration test"
   },
   {