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

* commit '8e70f63aba8e14f3b40b2a0769522505c1019c33':
  Prepare for switching to libziparchive.