API modifications needed to upstream Android font changes.

src/core/SkScalerContext.h

Index: src/core/SkScalerContext.h
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index dceabc18d91c51c9bc83614e4127f0f2db3de92e..53fcc184ddae24bd67ffb61c1a5fa41d606741ab 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -14,6 +14,10 @@
 #include "SkPaint.h"
 #include "SkTypeface.h"
 
+#ifdef SK_BUILD_FOR_ANDROID
+    #include "SkPaintOptionsAndroid.h"
+#endif
+
 struct SkGlyph;
 class SkDescriptor;
 class SkMaskFilter;
@@ -33,6 +37,9 @@ struct SkScalerContextRec {
 #ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
     SkScalar    fHintingScaleFactor;
 #endif
+#ifdef SK_BUILD_FOR_ANDROID
+    SkPaintOptionsAndroid fPaintOptionsAndroid;
+#endif
 
     //These describe the parameters to create (uniquely identify) the pre-blend.
     uint32_t    fLumBits;