am 626e1c65: am 8a28e16c: Merge "Update ziparchive usage to the new API."

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