fix a google string vs std::string issue for easier import#5685

mattklein123 merged 2 commits intoenvoyproxy:masterenvoyproxy/envoy:masterfrom

stevenzzzz:fix-tmp-referencestevenzzzz/envoy:fix-tmp-referenceCopy head branch name to clipboard