Merge "Make libziparchive C++-only."
am: b175ee271b

Change-Id: Ifaa182ff77248653974e2e8a19e7f36147be47f1