Merge "Move off ZipString and over to std::string/std::string_view as appropriate." into qt-dev-plus-aosp