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

Change-Id: I521ffb4ec750bb9f718c49c52855910ea2a0df0c