build: Bot_update refactor recipe roll

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 9de517073b18106b1d49913f9088f1d5010d0170..bcbf2256d2cb7eaea8185f86b0e454bdf95e4593 100644
--- a/scripts/slave/recipes/swarming/staging.expected/android.json
+++ b/scripts/slave/recipes/swarming/staging.expected/android.json
@@ -12,46 +12,6 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
-      "--master",
-      "chromium.testing.master",
-      "--builder",
-      "TestBuilder",
-      "--slave",
-      "TestSlavename",
-      "--spec",
-      "cache_dir = None\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']",
-      "--root",
-      "src",
-      "--revision_mapping_file",
-      "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
-      "--git-cache-dir",
-      "[GIT_CACHE]",
-      "--output_json",
-      "/path/to/tmp/json",
-      "--revision",
-      "src@204787",
-      "--revision",
-      "src/tools/swarming_client@HEAD",
-      "--output_manifest"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
-    },
-    "name": "bot_update",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"did_run\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
       "RECIPE_PACKAGE[depot_tools]/gclient.py",
       "config",
       "--spec",