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

Change-Id: I2b1be2f116c7830ad2ba49096636876f6620dc61