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

Change-Id: I748dfc6bfdf7430a3eda94624258d48b253310b9