Merge "Use the new ziparchive Next std::string_view overload." am: 053ea111a7 am: a3211f0ecb
am: e242d87430

Change-Id: I8ff8cb1640f86224395570d84f68c16b4c2c4618