Merge "dumpstate: track libziparchive API change."