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

* commit '48f25fa974b6ac620d62a54764294acb4aed10a3':
  adb doesn't actually use libzipfile.