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

Change-Id: I05a5b8e908965c166f07559f6de8841ce13842f1