Merge "zlib is not exposed to libziparchive headers" am: eb42bb8c8b
am: d74d572f9d

Change-Id: Ie544d690f230581559ad5e634ee24d03801f7ea5