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

Change-Id: I4776d56008693b1bc05695c7826e791a9d81b197