Merge "libziparchive: remove now-unused StartIteration overload." am: 547a94fd49
am: 543032725e

Change-Id: Ifb900aabea00d6659a872f98b5617c0e3d39ff33