Merge "Fix warnings in libziparchive"
am: 91811d2d34

Change-Id: I80141c999b90da513a6a31113398753fad623fba