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

* commit '05bbd6dd357e242ec09d169d219b0b018d258f72':
  Remove reference to libzipfile.