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

build/android/gyp/create_device_library_links.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.
 
 """Creates symlinks to native libraries for an APK.
 
 The native libraries should have previously been pushed to the device (in
 options.target_dir). This script then creates links in an apk's lib/ folder to
@@ skipping 46 matching lines @@
   if not device:
     return
 
   apk_package = apk_helper.GetPackageName(options.apk)
   apk_libraries_dir = '/data/data/%s/lib' % apk_package
 
   device_dir = os.path.dirname(options.script_device_path)
   mkdir_cmd = ('if [ ! -e %(dir)s ]; then mkdir -p %(dir)s; fi ' %
       { 'dir': device_dir })
   RunShellCommand(device, mkdir_cmd)
-  device.PushChangedFiles(options.script_host_path, options.script_device_path)
+  device.PushChangedFiles([(options.script_host_path,
+                            options.script_device_path)])
 
   trigger_cmd = (
       'APK_LIBRARIES_DIR=%(apk_libraries_dir)s; '
       'STRIPPED_LIBRARIES_DIR=%(target_dir)s; '
       '. %(script_device_path)s'
       ) % {
           'apk_libraries_dir': apk_libraries_dir,
           'target_dir': options.target_dir,
           'script_device_path': options.script_device_path
           }
@@ skipping 26 matching lines @@
 
   CreateSymlinkScript(options)
   TriggerSymlinkScript(options)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))