Revert of Revert of make gm background colors 565 compatible

gm/simpleaaclip.cpp

Index: gm/simpleaaclip.cpp
diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp
index c232a2575a5e8a897f3845bbc92372f347e31c0a..c0aa515507e02517a30f4e43f571f111514bc71e 100644
--- a/gm/simpleaaclip.cpp
+++ b/gm/simpleaaclip.cpp
@@ -64,7 +64,7 @@
 
         fBasePath.addRoundRect(fBase, SkIntToScalar(5), SkIntToScalar(5));
         fRectPath.addRoundRect(fRect, SkIntToScalar(5), SkIntToScalar(5));
-        INHERITED::setBGColor(0xFFDDDDDD);
+        INHERITED::setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
     }
 
     void buildRgn(SkAAClip* clip, SkRegion::Op op) {
@@ -156,7 +156,7 @@
 
         SkPaint textPaint;
         textPaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&textPaint);
+        sk_tool_utils::set_portable_typeface_always(&textPaint);
         textPaint.setTextSize(SK_Scalar1*24);
         int xOff = 0;