Merge "Track libziparchive API change." am: 3dd44d1973
am: 32112f0565

Change-Id: I51b605f0011926b5063a26a1541fd3bf87dccfb4