Merge "ziptool: fix unknown long options." am: fe983b6681 am: 8c139cf850
am: 92509e7608

Change-Id: Ibc0710ec448caf1e76753d991975ed223bfbaf36