Merge "libziparchive headers are moved to local directory"