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

Change-Id: Ibf367712e26414b81f976003366c0b40dd6f3ab8