make fontscalar gammatext lcdtext typeface verttext2 gm portable

gm/fontscaler.cpp

Index: gm/fontscaler.cpp
diff --git a/gm/fontscaler.cpp b/gm/fontscaler.cpp
index c3b2c87af255965bd0d1b645de0a625981a04d8e..608747856630cf3b5b42c5ac4231392f4c0fa29d 100644
--- a/gm/fontscaler.cpp
+++ b/gm/fontscaler.cpp
@@ -21,7 +21,9 @@ public:
 protected:
 
     SkString onShortName() override {
-        return SkString("fontscaler");
+        SkString name("fontscaler");
+        name.append(sk_tool_utils::major_platform_os_name());
+        return name;
     }
 
     SkISize onISize() override {
@@ -44,7 +46,6 @@ protected:
         //With freetype the default (normal hinting) can be really ugly.
         //Most distros now set slight (vertical hinting only) in any event.
         paint.setHinting(SkPaint::kSlight_Hinting);
-        sk_tool_utils::set_portable_typeface(&paint, "Times Roman", SkTypeface::kNormal);
 
         const char* text = "Hamburgefons ooo mmm";
         const size_t textLen = strlen(text);