Merge "dumpstate: track libziparchive API change."
am: eb975070be

Change-Id: I37fe7d4bc6afc62e7962a75831e089bdcc4ef9a8