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

Change-Id: I06d18e9443c1c15dfb3887df5ca874971f6a0243