Merge "unzip: add -Z for "zipinfo mode"." am: f16a98165b
am: b4380b93ed

Change-Id: I0182b73cf420c160f21a441a19cae9e07840d9e2