Parser for new fonts.xml format

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 5db2442c5e62ab57f0013fc597aee020065ed831..98ac5dc94f2134221419772239ae4ed18733868d 100644
--- a/src/ports/SkFontMgr_android.cpp
+++ b/src/ports/SkFontMgr_android.cpp
@@ -136,8 +136,8 @@ public:
             cannonicalFamilyName = &family.fNames[0];
         }
         // TODO? make this lazy
-        for (int i = 0; i < family.fFontFiles.count(); ++i) {
-            const FontFileInfo& fontFile = family.fFontFiles[i];
+        for (int i = 0; i < family.fFonts.count(); ++i) {
+            const FontFileInfo& fontFile = family.fFonts[i];
 
             SkString pathName;
             get_path_for_sys_fonts(basePath, fontFile.fFileName, &pathName);