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

Change-Id: Icefb783e8da17a4c985b6fef02d3c124d9e7892d