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

* commit '8a9dd8d124f2b4c1d89576895057009da729a4e1':
  Remove reference to libzipfile.