Merge "libziparchive: add integer checks" am: 80e72443d0
am: d25aebd7b7

Change-Id: I2895fa552d2390a133e9e345f1acecf9be9517c7