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

build/android/gyp/push_libraries.py

 #!/usr/bin/env python
 #
 # Copyright 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.
 
 """Pushes native libraries to a device.
 
 """
 
@@ skipping 22 matching lines @@
   # A list so that it is modifiable in Push below.
   needs_directory = [True]
   for lib in libraries:
     device_path = os.path.join(options.device_dir, lib)
     host_path = os.path.join(options.libraries_dir, lib)
 
     def Push():
       if needs_directory:
         device.RunShellCommand('mkdir -p ' + options.device_dir)
         needs_directory[:] = [] # = False
-      device.PushChangedFiles(host_path, device_path)
+      device.PushChangedFiles([(host_path, device_path)])
 
     record_path = '%s.%s.push.md5.stamp' % (host_path, serial_number)
     md5_check.CallAndRecordIfStale(
         Push,
         record_path=record_path,
         input_paths=[host_path],
         input_strings=[device_path])
 
 
 def main(args):
@@ skipping 17 matching lines @@
   constants.SetBuildType(options.configuration_name)
 
   DoPush(options)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))