Revert "build: roll infra_paths changes"

scripts/slave/recipes/example/defer_multiple.expected/nested_normal_fail.json

Index: scripts/slave/recipes/example/defer_multiple.expected/nested_normal_fail.json
diff --git a/scripts/slave/recipes/example/defer_multiple.expected/nested_normal_fail.json b/scripts/slave/recipes/example/defer_multiple.expected/nested_normal_fail.json
index 7640587dff70988cc2e1027ed4270c080e8fce7c..fcc8dff7b8062c30d86931a500c4950279b5d77b 100644
--- a/scripts/slave/recipes/example/defer_multiple.expected/nested_normal_fail.json
+++ b/scripts/slave/recipes/example/defer_multiple.expected/nested_normal_fail.json
@@ -3,24 +3,28 @@
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "prelude"
   },
   {
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "aggregated start"
   },
   {
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "aggregated finish"
   },
   {
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "normal start",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
@@ -31,42 +35,49 @@
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "normal finish"
   },
   {
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "composite start"
   },
   {
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "composite finish"
   },
   {
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "bogus"
   },
   {
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "steps"
   },
   {
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "jane"
   },
   {
     "cmd": [
       "true"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "clean up"
   },
   {