am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."

* commit 'd21752dff45c7d8856e63026cfddc303a302df14':
  Reimplement ZipFileRO in terms of libziparchive.