Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer-patch-rietveld.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "chromium.infra",
       "--builder",
       "cipd-module-tester",
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
       "--root",
       "build",
       "--revision_mapping_file",
       "{\"build\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--issue",
       "12853011",
       "--patchset",
       "1",
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "build@HEAD",
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"build\": \"HEAD\"@@@",
@@ skipping 16 matching lines @@
       "@@@STEP_LOG_END@json.output@@@",
       "@@@SET_BUILD_PROPERTY@got_revision@\"80754af91bfb6d1073585b046fe0a474ce868509\"@@@",
       "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#270553}\"@@@"
     ]
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
-      "[CWD]/build/scripts/tools/run_recipe.py",
+      "[SLAVE_BUILD]/build/scripts/tools/run_recipe.py",
       "infra/cipd_test",
       "--master-overrides-slave",
       "--properties-file",
-      "{\"buildername\": \"cipd-module-tester\", \"buildnumber\": 571, \"dir_to_package\": \"[CWD]/build/scripts/slave/recipe_modules/cipd\", \"mastername\": \"chromium.infra\", \"revision_tag\": \"80754af91bfb6d1073585b046fe0a474ce868509/12853011_1\", \"slavename\": \"TestSlavename\"}"
+      "{\"buildername\": \"cipd-module-tester\", \"buildnumber\": 571, \"dir_to_package\": \"[SLAVE_BUILD]/build/scripts/slave/recipe_modules/cipd\", \"mastername\": \"chromium.infra\", \"revision_tag\": \"80754af91bfb6d1073585b046fe0a474ce868509/12853011_1\", \"slavename\": \"TestSlavename\"}"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "actual run"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]