Merge "Make libziparchive C++-only." am: b175ee271b am: b7c94f3e50 am: 8f378bc31e
am: 478ffd46ce

Change-Id: I76b54a4cfc7194d884c5919084db342c224416d6