Reland "Simplified android_builder and moved internal-only methods to internal module"

scripts/slave/recipe_modules/chromium_android/example.expected/restart_usb_builder_basic.json

Index: scripts/slave/recipe_modules/chromium_android/example.expected/restart_usb_builder_basic.json
diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/restart_usb_builder_basic.json b/scripts/slave/recipe_modules/chromium_android/example.expected/restart_usb_builder_basic.json
index 062679406f84c6d5dc277254ebec8207b3e9f5fd..31fbaf42a69ea874abf40bcd132c866be9cf776d 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.expected/restart_usb_builder_basic.json
+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/restart_usb_builder_basic.json
@@ -170,7 +170,6 @@
       "runhooks"
     ],
     "env": {
-      "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD]/src/clank/build/get_internal_landmines.py",
       "GYP_DEFINES": "OS=android app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 component=static_library fastbuild=1 target_arch=arm",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
@@ -197,6 +196,44 @@
   },
   {
     "cmd": [
+      "[DEPOT_TOOLS]/git_number.py"
+    ],
+    "cwd": "[SLAVE_BUILD]/src",
+    "name": "git_number",
+    "stdout": "/path/to/tmp/"
+  },
+  {
+    "always_run": true,
+    "cmd": [
+      "python",
+      "-u",
+      "[BUILD]/scripts/slave/android/archive_build.py",
+      "--target",
+      "Release",
+      "--name",
+      "build_product.zip"
+    ],
+    "cwd": "[SLAVE_BUILD]/src",
+    "name": "zip_build_product"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[BUILD]/scripts/slave/recipe_modules/gsutil/resources/gsutil_wrapper.py",
+      "--",
+      "[DEPOT_TOOLS]/third_party/gsutil/gsutil",
+      "cp",
+      "[SLAVE_BUILD]/src/out/build_product.zip",
+      "gs://build-bucket/restart_usb_builder/build_product_4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00.zip"
+    ],
+    "name": "gsutil upload_build_product",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/build-bucket/restart_usb_builder/build_product_4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00.zip@@@"
+    ]
+  },
+  {
+    "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/recipe_modules/adb/resources/list_devices.py",
@@ -469,7 +506,8 @@
     "always_run": true,
     "cmd": [
       "rm",
-      "-rf"
+      "-rf",
+      "[SLAVE_BUILD]/src/out/build_product.zip"
     ],
     "name": "cleanup_build"
   }