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

Change-Id: I9f992d57fd65f341247b02a20d761a1863376fa4