Merge "Track libziparchive API change."