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

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