Roll recipe dependencies (nontrivial).

scripts/slave/recipes/swarming/staging.expected/android.json

Index: scripts/slave/recipes/swarming/staging.expected/android.json
diff --git a/scripts/slave/recipes/swarming/staging.expected/android.json b/scripts/slave/recipes/swarming/staging.expected/android.json
index b814a3eb79ef7981d9e11a0610c72c7af82ca837..39e21484782509ef4089df87a29c9bd2c14aef01 100644
--- a/scripts/slave/recipes/swarming/staging.expected/android.json
+++ b/scripts/slave/recipes/swarming/staging.expected/android.json
@@ -8,7 +8,6 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
@@ -20,7 +19,6 @@
       "--spec",
       "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', 'swarming_revision': '', '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']"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -43,7 +41,6 @@
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -87,7 +84,6 @@
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "--version"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "swarming.py --version",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -101,7 +97,6 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "GYP_CROSSCOMPILE": "1",
@@ -119,7 +114,6 @@
       "[SLAVE_BUILD]/src/out/Release",
       "--clean-isolated-files"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "clean isolated files"
   },
   {
@@ -178,7 +172,6 @@
       "ui_touch_selection_unittests_apk_run",
       "unit_tests_apk_run"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
@@ -210,7 +203,6 @@
       "/path/to/tmp/",
       "[SLAVE_BUILD]/src/out/Release/*.isolated.gen.json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "find isolated targets"
   },
   {
@@ -228,7 +220,6 @@
       "[SLAVE_BUILD]/src/out/Release/dummy_target_1.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/dummy_target_2.isolated.gen.json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "SWARMING_PROFILE": "1"
     },
@@ -300,7 +291,6 @@
       "--idempotent",
       "[dummy hash for chrome_public_test_apk]"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] chrome_public_test_apk on Android",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -371,7 +361,6 @@
       "--idempotent",
       "[dummy hash for dummy_target_1]"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] dummy_target_1 on Android",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -442,7 +431,6 @@
       "--idempotent",
       "[dummy hash for dummy_target_2]"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] dummy_target_2 on Android",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -476,7 +464,6 @@
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "chrome_public_test_apk on Android",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
@@ -538,7 +525,6 @@
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "dummy_target_1 on Android",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
@@ -600,7 +586,6 @@
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "dummy_target_2 on Android",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",