Android specific changes that are upstreamed from the android framework.

include/ports/SkTypeface_android.h

Index: include/ports/SkTypeface_android.h
diff --git a/include/ports/SkTypeface_android.h b/include/ports/SkTypeface_android.h
index fa702cb011c642c64b3d415a0758c16967aa1fac..655670fb6b4625718c24f2df931cc7abba1cfc87 100644
--- a/include/ports/SkTypeface_android.h
+++ b/include/ports/SkTypeface_android.h
@@ -9,10 +9,10 @@
 #ifndef SkTypeface_android_DEFINED
 #define SkTypeface_android_DEFINED
 
-#ifdef SK_BUILD_FOR_ANDROID
-
 #include "SkTypeface.h"
 
+#ifdef SK_BUILD_FOR_ANDROID
+
 class SkPaintOptionsAndroid;
 
 /**
@@ -47,4 +47,26 @@ SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontI
                                          const SkPaintOptionsAndroid& options);
 
 #endif // #ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+
+#include "SkPaintOptionsAndroid.h"
+#include "../harfbuzz/src/harfbuzz-shaper.h"
+#include "../harfbuzz_ng/src/hb.h"
+
+/**
+ *  Return a new typeface for a fallback script. If the script is
+ *  not valid, or can not map to a font, returns null.
+ *  @param  script   The harfbuzz script id.
+ *  @param  style    The font style, for example bold
+ *  @param  elegant  true if we want the web friendly elegant version of the font
+ *  @return          reference to the matching typeface. Caller must call
+ *                   unref() when they are done.
+ */
+SK_API SkTypeface* SkCreateTypefaceForScriptNG(hb_script_t script, SkTypeface::Style style,
+        SkPaintOptionsAndroid::FontVariant fontVariant = SkPaintOptionsAndroid::kDefault_Variant);
+
+SK_API SkTypeface* SkCreateTypefaceForScript(HB_Script script, SkTypeface::Style style,
+        SkPaintOptionsAndroid::FontVariant fontVariant = SkPaintOptionsAndroid::kDefault_Variant);
+
+#endif // #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
 #endif // #ifndef SkTypeface_android_DEFINED