[Android] Reland of 'Add zip pushing and refine push mode selection.'

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 54 matching lines @@
     # running at all.
     device.KillAll('adb_reboot', blocking=True, timeout=2, retries=0)
   except device_errors.CommandFailedError:
     # We can safely ignore the exception because we don't expect adb_reboot
     # to be running.
     pass
   # Push adb_reboot
   logging.info('  Pushing adb_reboot ...')
   adb_reboot = os.path.join(constants.DIR_SOURCE_ROOT,
                             'out/%s/adb_reboot' % target)
-  device.PushChangedFiles(adb_reboot, '/data/local/tmp/')
+  device.PushChangedFiles([(adb_reboot, '/data/local/tmp/')])
   # Launch adb_reboot
   logging.info('  Launching adb_reboot ...')
   device.old_interface.GetAndroidToolStatusAndOutput(
       '/data/local/tmp/adb_reboot')
 
 
 def _ConfigureLocalProperties(device, is_perf):
   """Set standard readonly testing device properties prior to reboot."""
   local_props = [
       'persist.sys.usb.config=adb',
@@ skipping 163 matching lines @@
 
   if args:
     print >> sys.stderr, 'Unused args %s' % args
     return 1
 
   return ProvisionDevices(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))