Merge "StrictJarFile can use the new std::string libziparchive Next overload."...
Merge "StrictJarFile can use the new std::string libziparchive Next overload." am: 9fa4e044 am: d5a3817e
am: efaee402
Change-Id: I85ad1c39c7d9b4391d0ab2ca83fed7e627626c99