Roll recipe dependencies (nontrivial).

scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify.json

Index: scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify.json
diff --git a/scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify.json b/scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify.json
index 16e9ad0505664d76a9eb794aaa269a3d4abe4b17..3b2cf63512844e7ad06bcfcfabede3cc39becb7b 100644
--- a/scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify.json
+++ b/scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify.json
@@ -47,7 +47,6 @@
       "--spec",
       "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -68,7 +67,6 @@
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -140,7 +138,6 @@
       "[SLAVE_BUILD]/tmp",
       "511"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs tmp_dir",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -163,7 +160,6 @@
       "[SLAVE_BUILD]/tmp/SKP_VERSION",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "Get downloaded SKP_VERSION"
   },
   {
@@ -174,7 +170,6 @@
       "[SLAVE_BUILD]/skia/SKP_VERSION",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "Get expected SKP_VERSION"
   },
   {
@@ -185,7 +180,6 @@
       "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "Get downloaded SK_IMAGE_VERSION"
   },
   {
@@ -196,7 +190,6 @@
       "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "Get expected SK_IMAGE_VERSION"
   },
   {
@@ -217,7 +210,6 @@
       "-u",
       "import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n  ccache = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n  pass\nprint json.dumps({'ccache': ccache})\n"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "BUILDTYPE": "Release",
       "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -250,7 +242,6 @@
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
       "[SLAVE_BUILD]/skia/platform_tools/android/apps/visualbench/build/outputs/apk"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree apk",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -271,7 +262,6 @@
       "[SLAVE_BUILD]/skia/platform_tools/android/apps/visualbench/build/outputs/apk",
       "511"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs apk",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -293,7 +283,6 @@
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
       "[SLAVE_BUILD]/skia/platform_tools/android/apps/visualbench/src/main/assets"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree assets",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -314,7 +303,6 @@
       "[SLAVE_BUILD]/skia/platform_tools/android/apps/visualbench/src/main/assets",
       "511"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs assets",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -337,7 +325,6 @@
       "--undefok -i /sdcard/resources --skps /sdcard/skps --images /sdcard/images/dm --nocpu --dummy-flags --outResultsFile /sdcard/skia_results/nanobench_164710_1408633190.json --properties gitHash 164710 build_number 5 --key arch Arm7 compiler GCC cpu_or_gpu GPU cpu_or_gpu_value Adreno330 extra_config Appurify model Nexus5 os Android",
       "[SLAVE_BUILD]/skia/platform_tools/android/apps/visualbench/src/main/assets/nanobench_flags.txt"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "write nanobench_flags.txt"
   },
   {
@@ -376,7 +363,6 @@
       "--resource-dir",
       "[SLAVE_BUILD]/skia/resources"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
       "ANDROID_MAKE_CCACHE": "/usr/bin/ccache",
@@ -399,7 +385,6 @@
       "-d",
       "[SLAVE_BUILD]/tmp"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "BUILDTYPE": "Release",
       "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -415,7 +400,6 @@
       "[SLAVE_BUILD]/perfdata/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify/data",
       "511"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs perf_dir",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -437,7 +421,6 @@
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
       "[SLAVE_BUILD]/perfdata/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify/data"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree data",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -459,7 +442,6 @@
       "[SLAVE_BUILD]/perfdata/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify/data",
       "0"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "copy dir"
   },
   {