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

Change-Id: I0943c24388ed5895603d0aa33bad1572e29f8e9d