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

Change-Id: Ic87fff08eaf240bbaa370432b6955520206d3882