Respect declared font style on Android.

src/ports/SkFontMgr_android.cpp

Index: src/ports/SkFontMgr_android.cpp
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp
index 49ca08194be77cb7044779abce2b07b0d87cdeb7..4251b10ae84e9b7a6f52f1c8fc4b2ececf558164 100644
--- a/src/ports/SkFontMgr_android.cpp
+++ b/src/ports/SkFontMgr_android.cpp
@@ -145,9 +145,15 @@ public:
                 continue;
             }
 
-            if (fontFile.fWeight != 0) {
-                style = SkFontStyle(fontFile.fWeight, style.width(), style.slant());
+            int weight = fontFile.fWeight != 0 ? fontFile.fWeight : style.weight();
+            SkFontStyle::Slant slant;
+            switch (fontFile.fStyle) {
+                case FontFileInfo::Style::Auto: slant = style.slant(); break;
+                case FontFileInfo::Style::Normal: slant = SkFontStyle::kUpright_Slant; break;
+                case FontFileInfo::Style::Italic: slant = SkFontStyle::kItalic_Slant; break;
+                default: SkASSERT(false); break;
             }
+            style = SkFontStyle(weight, style.width(), slant);
 
             const SkLanguage& lang = family.fLanguage;
             uint32_t variant = family.fVariant;