Merge "Replace libziparchive-host with libziparchive"
am: 0641c2b483

Change-Id: Ic735334f421dabcb07ccebb5a9d2f5d8bd1804a8