Merge "Make libziparchive C++-only."