Merge "libziparchive: fix -Wimplicit-int-float-conversion" am: 8e2f75e319
am: f522f4b748

Change-Id: I884619ffb24dcb56a417781002a77806cc940dab