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

build/android/pylib/forwarder.py

 # Copyright (c) 2012 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.
 
 # pylint: disable=W0212
 
 import fcntl
 import logging
 import os
 import psutil
@@ skipping 270 matching lines @@
 
     Args:
       device: A DeviceUtils instance.
       tool: Tool class to use to get wrapper, if necessary, for executing the
             forwarder (see valgrind_tools.py).
     """
     device_serial = str(device)
     if device_serial in self._initialized_devices:
       return
     Forwarder._KillDeviceLocked(device, tool)
-    device.PushChangedFiles(
+    device.PushChangedFiles([(
         self._device_forwarder_path_on_host,
-        Forwarder._DEVICE_FORWARDER_FOLDER)
+        Forwarder._DEVICE_FORWARDER_FOLDER)])
     cmd = '%s %s' % (tool.GetUtilWrapper(), Forwarder._DEVICE_FORWARDER_PATH)
     (exit_code, output) = device.old_interface.GetAndroidToolStatusAndOutput(
         cmd, lib_path=Forwarder._DEVICE_FORWARDER_FOLDER)
     if exit_code != 0:
       raise Exception(
           'Failed to start device forwarder:\n%s' % '\n'.join(output))
     self._initialized_devices.add(device_serial)
 
   def _KillHostLocked(self):
     """Kills the forwarder process running on the host.
@@ skipping 23 matching lines @@
     """
     logging.info('Killing device_forwarder.')
     Forwarder._instance._initialized_devices.discard(str(device))
     if not device.FileExists(Forwarder._DEVICE_FORWARDER_PATH):
       return
 
     cmd = '%s %s --kill-server' % (tool.GetUtilWrapper(),
                                    Forwarder._DEVICE_FORWARDER_PATH)
     device.old_interface.GetAndroidToolStatusAndOutput(
         cmd, lib_path=Forwarder._DEVICE_FORWARDER_FOLDER)