Merge "libziparchive: start moving to a non-ZipString StartIteration API."
am: 05b9448ff7

Change-Id: I0cd47681935fc831e844ceb5ab99cb049364b6cf