Merge "libziparchive: add zipinfo(1)." am: 23a3dceaa5
am: 3853870eca

Change-Id: I5725b4a265aee0cb67ae1b7805c65a58f406f4a7