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

Change-Id: I4934a3ab3e75d8b3161a1c647f7ffead99223c99