Merge "Remove libziparchive dependency on libutils"
am: 34f8eaab0d

Change-Id: I41c99c26aebc23b2cc1d82b2e147e5be5aada114