Merge "ziptool: fix unknown long options."
am: fe983b6681

Change-Id: I9f192a6d1f3e9a5c92e898f21aa0ee0d1f125d07