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

Change-Id: I3b05aea4e31c0f11f5d4fe0e8418aedb9e6cd0e2