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

Change-Id: Icfa8cbc09325c481227c318c9ae027b03c1efcef