Merge "Replace libziparchive-host with libziparchive" am: b5a1a4a772
am: e882b6c845

Change-Id: Id3c0ffe5359c8963ed8385f225920755b17a5574