Revert of Update typeface serialization style.

src/core/SkTypeface.cpp

Index: src/core/SkTypeface.cpp
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index 9ab37a80dff137825330dfe033c581df0dd234e9..90a1eaabeca08d956974e96812bb5273ec5a0ffb 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -167,7 +167,7 @@
         return;
     }
     bool isLocal = false;
-    SkFontDescriptor desc;
+    SkFontDescriptor desc(this->style());
     this->onGetFontDescriptor(&desc, &isLocal);
 
     // Embed font data if it's a local font.
@@ -195,7 +195,8 @@
         }
     }
 
-    return SkTypeface::MakeFromName(desc.getFamilyName(), desc.getStyle());
+    return SkTypeface::MakeFromName(desc.getFamilyName(),
+                                    SkFontStyle::FromOldStyle(desc.getStyle()));
 }
 
 ///////////////////////////////////////////////////////////////////////////////