API modifications needed to upstream Android font changes.

include/core/SkPaint.h

Index: include/core/SkPaint.h
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index a73a46a2c6d3b6e612cdbb0eb67fe826d2cce104..d8a10b3b81fd4cce4288296887867fb301ef68b6 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -14,6 +14,9 @@
 #include "SkColor.h"
 #include "SkDrawLooper.h"
 #include "SkXfermode.h"
+#ifdef SK_BUILD_FOR_ANDROID
+#include "SkPaintOptionsAndroid.h"
+#endif
 
 class SkAnnotation;
 class SkAutoGlyphCache;
@@ -638,6 +641,11 @@ public:
     */
     void    setTextAlign(Align align);
 
+#ifdef SK_BUILD_FOR_ANDROID
+    const SkPaintOptionsAndroid& getPaintOptionsAndroid() const { return fPaintOptionsAndroid; }
+    void setPaintOptionsAndroid(const SkPaintOptionsAndroid& options);
+#endif
+
     /** Return the paint's text size.
         @return the paint's text size.
     */
@@ -990,6 +998,8 @@ private:
     friend class SkTextToPathIter;
 
 #ifdef SK_BUILD_FOR_ANDROID
+    SkPaintOptionsAndroid fPaintOptionsAndroid;
+
     // In order for the == operator to work properly this must be the last field
     // in the struct so that we can do a memcmp to this field's offset.
     uint32_t        fGenerationID;