Merge "System/core: Remove include/ziparchive" am: ae590fe723
am: 10e80f3715

Change-Id: I585cb91604498e4b19d3706c231e586ffb1b5a10