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

Change-Id: I593cf5812397d8672026576747b8fd83b7df9e53