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

Change-Id: I89af1b145ff6ede6b09b39c892e8203f7ed4432a