Merge "Libziparchive: Export headers in defaults" am: c31963b5c2 am: bf4029cdfb am: 417556a5f8
am: 65dc50f7db

Change-Id: I900d654757457d3b5b24e2475a02fab3663aabf1