Merge "Rename unzip.cpp to ziptool.cpp." am: cd652ea3dc am: 8025cee478

Change-Id: I785ee3029bf7c34a63cd48b56ebf977773543e26