Merge "Remove libziparchive dependency on libutils" am: 34f8eaab0d am: 8b70132880
am: f9cd8e0e83

Change-Id: Id29bd51f85d7482c105b54f7202b5fc454396873