Merge "Track libziparchive API change." am: 71e79a2396
am: b17db5960e

Change-Id: I07b669391eb8030bd09529f224fefefe73a6d1f5