Merge "Move off ZipString and over to std::string/std::string_view as appropriate."
am: 93903b798d

Change-Id: I4fb159bf7204f34a87be65c8496de18a14c9b2ca