am 57bf3109: Merge "Prepare for switching to libziparchive."

* commit '57bf3109db7559f36c7c182cf87fe52c14b98f0d':
  Prepare for switching to libziparchive.