Merge "Reduce libziparchive internal hashtable memory size"