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

Change-Id: I2afd17e71a5a1bdc17ce4189284277bfc0c34bd5