Merge "zip_archive: Remove unused ziparchive-host" am: 4adb4ce223 am: 5cc1bd65ed
am: 2440323318

Change-Id: I132454e29ee2d9406a01cf5465a44255111e94e7