Add android.Paint that inherits SkPaint

The idea is that extra paint parameters that only affect text layout
(not rendering) will go in android.Paint instead of going into
SkPaintOptionsAndroid.  We will eventually move those out of SkPaint
too.

This is currently implemented in PaintImpl.cpp.  Will be renamed when
current Paint.cpp that has JNI bits is moved to android_graphics_Paint.cpp.

Change-Id: Iba66c34dea5da503a13b9c864cb9f2211ac4ba7d
diff --git a/core/jni/android/graphics/CanvasProperty.cpp b/core/jni/android/graphics/CanvasProperty.cpp
index cfa9cd8..e63c5fa 100644
--- a/core/jni/android/graphics/CanvasProperty.cpp
+++ b/core/jni/android/graphics/CanvasProperty.cpp
@@ -16,6 +16,7 @@
 
 #include "jni.h"
 #include "GraphicsJNI.h"
+#include "Paint.h"
 #include <android_runtime/AndroidRuntime.h>
 
 #include <utils/RefBase.h>
@@ -32,7 +33,7 @@
 }
 
 static jlong createPaint(JNIEnv* env, jobject clazz, jlong paintPtr) {
-    const SkPaint* paint = reinterpret_cast<const SkPaint*>(paintPtr);
+    const Paint* paint = reinterpret_cast<const Paint*>(paintPtr);
     return reinterpret_cast<jlong>(new CanvasPropertyPaint(*paint));
 }