Revert of Move SkTypeface to sk_sp.

src/core/SkPictureData.cpp

Index: src/core/SkPictureData.cpp
diff --git a/src/core/SkPictureData.cpp b/src/core/SkPictureData.cpp
index 873c0c4a1d913c9e78205273bde25ef14aad721e..ed32c6c029f498e45aa1d06859043d70b2e7c7e7 100644
--- a/src/core/SkPictureData.cpp
+++ b/src/core/SkPictureData.cpp
@@ -405,13 +405,13 @@
             const int count = SkToInt(size);
             fTFPlayback.setCount(count);
             for (int i = 0; i < count; i++) {
-                sk_sp<SkTypeface> tf(SkTypeface::MakeDeserialize(stream));
+                SkAutoTUnref<SkTypeface> tf(SkTypeface::Deserialize(stream));
                 if (!tf.get()) {    // failed to deserialize
                     // fTFPlayback asserts it never has a null, so we plop in
                     // the default here.
-                    tf = SkTypeface::MakeDefault();
+                    tf.reset(SkTypeface::RefDefault());
                 }
-                fTFPlayback.set(i, tf.get());
+                fTFPlayback.set(i, tf);
             }
         } break;
         case SK_PICT_PICTURE_TAG: {