Merge "Track libziparchive API change."
am: 71e79a2396

Change-Id: Ia408edd9d3c0ad497dabccf11073886bb9edf8df