am 0bc3607c: (-s ours) am 9f09408e: am 336bf2fb: am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."

* commit '0bc3607c2823752ae68fe9a2f45803ecc7895a84':
  Reimplement ZipFileRO in terms of libziparchive.