am b054582b: Merge "libziparchive: fix issue with a directory with one file"

* commit 'b054582b90de67a5839345b3a39ad683329f1453':
  libziparchive: fix issue with a directory with one file