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

Change-Id: I7311dfb8947b1204b9587a36df60c4e2fab5f411