Merge "Move off ZipString and over to std::string/std::string_view as...
Merge "Move off ZipString and over to std::string/std::string_view as appropriate." into qt-dev-plus-aosp am: ee1c95f0
am: 0566225c
Change-Id: I351ea009ee322ecd8bd117e4b2b686c636fb6770