Upload_build prior to running tests and add common tests steps to cronet recipe.

scripts/slave/recipes/cronet.expected/android_cronet_builder__dbg_.json

Index: scripts/slave/recipes/cronet.expected/android_cronet_builder__dbg_.json
diff --git a/scripts/slave/recipes/cronet.expected/android_cronet_builder__dbg_.json b/scripts/slave/recipes/cronet.expected/android_cronet_builder__dbg_.json
index c8f05b4ec77920c948c306de5233ba0aa35f98be..0961face5dfbf2d58317887bb406ec567e8f4dce 100644
--- a/scripts/slave/recipes/cronet.expected/android_cronet_builder__dbg_.json
+++ b/scripts/slave/recipes/cronet.expected/android_cronet_builder__dbg_.json
@@ -119,6 +119,56 @@
   },
   {
     "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",
+      "Debug",
+      "--name",
+      "build_product_3000.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_3000.zip",
+      "gs://chromium-cronet/android/cronet-3000.zip"
+    ],
+    "name": "gsutil upload_build_product",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-cronet/android/cronet-3000.zip@@@"
+    ]
+  },
+  {
+    "can_fail_build": false,
+    "cmd": [
+      "[BUILD]/scripts/slave/daemonizer.py",
+      "--",
+      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
+      "[SLAVE_BUILD]/src/out/logcat"
+    ],
+    "env": {
+      "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s"
+    },
+    "name": "spawn_logcat_monitor"
+  },
+  {
+    "cmd": [
       "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py"
     ],
     "env": {
@@ -127,6 +177,18 @@
     "name": "device_status_check"
   },
   {
+    "can_fail_build": false,
+    "cmd": [
+      "[SLAVE_BUILD]/src/build/android/provision_devices.py",
+      "-t",
+      "Debug"
+    ],
+    "env": {
+      "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s"
+    },
+    "name": "provision_devices"
+  },
+  {
     "cmd": [
       "python",
       "-u",
@@ -148,40 +210,36 @@
     "name": "test CronetSample"
   },
   {
-    "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",
-      "Debug",
-      "--name",
-      "build_product_3000.zip"
+      "[BUILD]/scripts/slave/tee.py",
+      "[SLAVE_BUILD]/src/out/Debug/full_log",
+      "--",
+      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
+      "[SLAVE_BUILD]/src/out/logcat"
     ],
-    "cwd": "[SLAVE_BUILD]/src",
-    "name": "zip_build_product"
+    "name": "logcat_dump"
   },
   {
+    "always_run": true,
     "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_3000.zip",
-      "gs://chromium-cronet/android/cronet-3000.zip"
+      "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n  with open(report, 'r') as f:\n    for l in f.readlines():\n      print l\n  os.remove(report)\n",
+      "[SLAVE_BUILD]/src/out/Debug/test_logs/*.log"
     ],
-    "name": "gsutil upload_build_product",
+    "name": "test_report",
     "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-cronet/android/cronet-3000.zip@@@"
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  with open(report, 'r') as f:@@@",
+      "@@@STEP_LOG_LINE@python.inline@    for l in f.readlines():@@@",
+      "@@@STEP_LOG_LINE@python.inline@      print l@@@",
+      "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {