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

Change-Id: I99f5be69402ada1bccc890cc7df451e628b3e5da