Merge "Fix warnings in libziparchive" am: 91811d2d34 am: 6f5edc78d8 am: e3d8246c0b
am: bcedc20a2e

Change-Id: Ie67aafbf802b295b2a71ace612d898f02830510d