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