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

Change-Id: Ic4b372e601b2e66aef25c3c2b536fce86547657c