Merge "Libziparchive: Export headers in defaults"