[automerger skipped] Merge "Move off ZipString and over to std::string/std::string_view as appropriate." am: 93903b798d
am: 4e696020ff -s ours
am skip reason: change_id Ib46761d89772d3a3c655a39df573fd305c117d19 with SHA1 78de4f999d is in history

Change-Id: I4721c652e75129f70b5627a39d154a552902ce68