Merge "Remove libziparchive dependency on libutils" am: 3d0a566bcc am: a3114f7a27
am: 19a128b33e

Change-Id: I0db70f87a9b5e45cca057ab90c5392e574768806