am 7f0564ba: am 48f25fa9: Merge "adb doesn\'t actually use libzipfile."

* commit '7f0564bab89da86886bbd82ecea84acd409ba0d9':
  adb doesn't actually use libzipfile.