Merge "Remove libziparchive dependency on libutils"
am: 617968b4ef

Change-Id: Ie6fd7bbd7b4167aa8dabac3a78cf2287412a7f4a