Merge "libziparchive: 64 bit compile issues"