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

Change-Id: Id0a5c758c14621398d96de226dac209d3d6e3e1a