Merge "adb doesn't actually use libzipfile."