Revert of Move SkTypeface to sk_sp.

samplecode/SampleApp.cpp

Index: samplecode/SampleApp.cpp
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index e4362c5a36a3598fdcef9c231fb13d291057506d..1df96c80c89aab254c25d5775bff38226bc6853d 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -935,7 +935,7 @@
 
     fMouseX = fMouseY = 0;
     fFatBitsScale = 8;
-    fTypeface = SkTypeface::MakeFromTypeface(nullptr, SkTypeface::kBold);
+    fTypeface = SkTypeface::CreateFromTypeface(nullptr, SkTypeface::kBold);
     fShowZoomer = false;
 
     fZoomLevel = 0;
@@ -1061,6 +1061,7 @@
 }
 
 SampleWindow::~SampleWindow() {
+    SkSafeUnref(fTypeface);
     SkSafeUnref(fDevManager);
 }