am d3b57a16: am 8a9dd8d1: am 05bbd6dd: Merge "Remove reference to libzipfile."

* commit 'd3b57a16b2330fcf29eeb7b00ad189da01dddb54':
  Remove reference to libzipfile.