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

Change-Id: I9efbb31fde3c96967caf354bbbe7ea7931072a0a