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

Change-Id: Ibfd1ecbdbfa96d17470137e45319fa997dd87e0b