Merge "Remove libziparchive dependency on libutils"
am: 3d0a566bcc

Change-Id: Iad55f892d8a68a09a1c6363137cfc4d40da8e98b