Revert of Respect declared font style on Android.

src/ports/SkFontConfigParser_android.cpp

 /*
  * 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.
  */
 
 #include "SkFontConfigParser_android.h"
 #include "SkFontMgr_android.h"
 #include "SkStream.h"
@@ skipping 141 matching lines @@
     // NOTE: we ignore the style.
     // The element should contain a filename.
     for (size_t i = 0; ATTS_NON_NULL(attributes, i); i += 2) {
         const char* name = attributes[i];
         const char* value = attributes[i+1];
         size_t nameLen = strlen(name);
         if (MEMEQ("weight", name, nameLen)) {
             if (!parse_non_negative_integer(value, &file->fWeight)) {
                 SkDebugf("---- Font weight %s (INVALID)", value);
             }
-        } else if (MEMEQ("style", name, nameLen)) {
-            size_t valueLen = strlen(value);
-            if (MEMEQ("normal", value, valueLen)) {
-                file->fStyle = FontFileInfo::Style::kNormal;
-            } else if (MEMEQ("italic", value, valueLen)) {
-                file->fStyle = FontFileInfo::Style::kItalic;
-            }
         } else if (MEMEQ("index", name, nameLen)) {
             if (!parse_non_negative_integer(value, &file->fIndex)) {
                 SkDebugf("---- Font index %s (INVALID)", value);
             }
         }
     }
     XML_SetCharacterDataHandler(self->fParser, font_file_name_handler);
 }
 
 static FontFamily* find_family(FamilyData* self, const SkString& familyName) {
@@ skipping 455 matching lines @@
     const char* tag = fTag.c_str();
 
     // strip off the rightmost "-.*"
     const char* parentTagEnd = strrchr(tag, '-');
     if (parentTagEnd == NULL) {
         return SkLanguage();
     }
     size_t parentTagLen = parentTagEnd - tag;
     return SkLanguage(tag, parentTagLen);
 }