am c4168d85: Merge "Update ziparchive usage to the new API."

* commit 'c4168d854f03c90d3194718763714b0ad66ed30b':
  Update ziparchive usage to the new API.