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

Change-Id: I34ebe463e0a116f7a002576054b9a2205cd05414