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

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