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

scripts/slave/recipes/cronet.py

Index: scripts/slave/recipes/cronet.py
diff --git a/scripts/slave/recipes/cronet.py b/scripts/slave/recipes/cronet.py
index 09c124d1012ec25d6ab537af722843b2fc7de541..ddd0948fe0cf1c3a3e037fc09d11a9112f9f6162 100644
--- a/scripts/slave/recipes/cronet.py
+++ b/scripts/slave/recipes/cronet.py
@@ -38,9 +38,10 @@ def GenSteps(api):
   yield droid.clean_local_files()
   yield droid.runhooks()
   yield droid.compile()
+  yield droid.upload_build()
 
   if builder_config['run_tests']:
-    yield droid.device_status_check()
+    yield droid.common_tests_setup_steps()
     install_cmd = api.path['checkout'].join('build',
                                             'android',
                                             'adb_install_apk.py')
@@ -51,8 +52,9 @@ def GenSteps(api):
                                          'test_runner.py')
     yield api.python('test CronetSample', test_cmd,
         args = ['instrumentation', '--test-apk', 'CronetSampleTest'])
-  yield droid.upload_build()
-  yield droid.cleanup_build()
+    yield droid.common_tests_final_steps()
+  else:
+    yield droid.cleanup_build()
 
 def _sanitize_nonalpha(text):
   return ''.join(c if c.isalnum() else '_' for c in text.lower())