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

Change-Id: I2607cdeb25e0dd9d5895b74176a20324366de6eb