Merge "ziptool: fix unknown long options."