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

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