Revert of Respect declared font style on Android.

src/ports/SkFontConfigParser_android.h

 /*
  * Copyright 2011 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.
  */
 
 #ifndef SKFONTCONFIGPARSER_ANDROID_H_
 #define SKFONTCONFIGPARSER_ANDROID_H_
 
@@ skipping 44 matching lines @@
 enum FontVariants {
    kDefault_FontVariant = 0x01,
    kCompact_FontVariant = 0x02,
    kElegant_FontVariant = 0x04,
    kLast_FontVariant = kElegant_FontVariant,
 };
 typedef uint32_t FontVariant;
 
 // Must remain trivially movable (can be memmoved).
 struct FontFileInfo {
-    FontFileInfo() : fIndex(0), fWeight(0), fStyle(Style::kAuto) { }
+    FontFileInfo() : fIndex(0), fWeight(0) { }
 
     SkString fFileName;
     int fIndex;
     int fWeight;
-    enum class Style { kAuto, kNormal, kItalic } fStyle;
 };
 
 /**
  * A font family provides one or more names for a collection of fonts, each of
  * which has a different style (normal, italic) or weight (thin, light, bold,
  * etc).
  * Some fonts may occur in compact variants for use in the user interface.
  * Android distinguishes "fallback" fonts to support non-ASCII character sets.
  */
 struct FontFamily {
@@ skipping 21 matching lines @@
 /** Parses font configuration files and appends result to fontFamilies. */
 void GetCustomFontFamilies(SkTDArray<FontFamily*>& fontFamilies,
                            const SkString& basePath,
                            const char* fontsXml,
                            const char* fallbackFontsXml,
                            const char* langFallbackFontsDir = NULL);
 
 } // SkFontConfigParser namespace
 
 #endif /* SKFONTCONFIGPARSER_ANDROID_H_ */