Merge "Replace libziparchive-host with libziparchive" am: 091b631915 am: 904c1042cd am: 4379ca6d18
am: 7ac7599c0e

Change-Id: I4ba8110ee60183f9568841f2f7946175f084b9d4