[Android] Remove Reboot devices step

Consolidate these commands into provision_devices.

TBR=sivachandra@chromium.org
NOTRY=True

Review URL: https://chromiumcodereview.appspot.com/16472008

git-svn-id: http://src.chromium.org/svn/trunk/src/build@205118 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/buildbot/bb_device_steps.py

@@ -71,7 +71,6 @@ def RebootDeviceSafe(device):
 
 def RebootDevices():
   """Reboot all attached and online devices."""
-  buildbot_report.PrintNamedStep('Reboot devices')
   # Early return here to avoid presubmit dependence on adb,
   # which might not exist in this checkout.
   if bb_utils.TESTING:
@@ -234,18 +233,16 @@ def MainTestWrapper(options):
   # Wait for logcat_monitor to pull existing logcat
   RunCmd(['sleep', '5'])
 
+  # Provision devices
+  buildbot_report.PrintNamedStep('provision_devices')
   if options.reboot:
     RebootDevices()
+  RunCmd(['build/android/provision_devices.py', '-t', options.target])
 
   # Device check and alert emails
   buildbot_report.PrintNamedStep('device_status_check')
   RunCmd(['build/android/device_status_check.py'], halt_on_failure=True)
 
-  # Provision devices
-  buildbot_report.PrintNamedStep('provision_devices')
-  target = options.factory_properties.get('target', 'Debug')
-  RunCmd(['build/android/provision_devices.py', '-t', target])
-
   if options.install:
     test_obj = INSTRUMENTATION_TESTS[options.install]
     InstallApk(options, test_obj, print_step=True)