API modifications needed to upstream Android font changes.

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 e87fa4805a34452f6087ab08b5c627a0e59f6d10..0d89736e7ea9ae03c4615686bf189bfb800aedcd 100644
--- a/include/ports/SkTypeface_android.h
+++ b/include/ports/SkTypeface_android.h
@@ -9,6 +9,8 @@
 #ifndef SkTypeface_android_DEFINED
 #define SkTypeface_android_DEFINED
 
+#ifdef SK_BUILD_FOR_ANDROID
+
 #include "SkTypeface.h"
 
 /**
@@ -39,6 +41,8 @@ SK_API void SkUseTestFontConfigFile(const char* mainconf, const char* fallbackco
  *  get the 3rd can still inspect the original, and try to match its
  *  stylistic attributes.
  */
-SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID);
+SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
+                                         const SkPaintOptionsAndroid& options);
 
-#endif
+#endif // #ifdef SK_BUILD_FOR_ANDROID
+#endif // #ifndef SkTypeface_android_DEFINED