Revert of Update typeface serialization style.

src/ports/SkFontMgr_custom.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontDescriptor.h"
 #include "SkFontHost_FreeType_common.h"
 #include "SkFontMgr.h"
@@ skipping 25 matching lines @@
 
     bool isSysFont() const { return fIsSysFont; }
 
 protected:
     void onGetFamilyName(SkString* familyName) const override {
         *familyName = fFamilyName;
     }
 
     void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override {
         desc->setFamilyName(fFamilyName.c_str());
-        desc->setStyle(this->fontStyle());
         *isLocal = !this->isSysFont();
     }
 
     int getIndex() const { return fIndex; }
 
 private:
     const bool fIsSysFont;
     const SkString fFamilyName;
     const int fIndex;
 
@@ skipping 454 matching lines @@
         SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
         families->push_back().reset(family);
         family->appendTypeface(sk_make_sp<SkTypeface_Empty>());
     }
 
 };
 
 SK_API SkFontMgr* SkFontMgr_New_Custom_Empty() {
     return new SkFontMgr_Custom(EmptyFontLoader());
 }