Fix the build, for real

Change-Id: I6263f7e5e3ae2f7efe045f8b464c0ed1b87fc793

api/current.txt

@@ -8001,7 +8001,7 @@ package android.graphics {
     method public android.graphics.DrawFilter getDrawFilter();
     method public int getHeight();
     method public deprecated void getMatrix(android.graphics.Matrix);
-    method public final android.graphics.Matrix getMatrix();
+    method public final deprecated android.graphics.Matrix getMatrix();
     method public int getMaximumBitmapHeight();
     method public int getMaximumBitmapWidth();
     method public int getSaveCount();

graphics/java/android/graphics/DrawFilter.java

@@ -28,7 +28,11 @@ public class DrawFilter {
     /* package */ int mNativeInt;    // pointer to native object
 
     protected void finalize() throws Throwable {
-        nativeDestructor(mNativeInt);
+        try {
+            nativeDestructor(mNativeInt);
+        } finally {
+            super.finalize();
+        }
     }
     
     private static native void nativeDestructor(int nativeDrawFilter);

libs/hwui/DisplayListRenderer.h

@@ -422,7 +422,7 @@ private:
             return;
         }
 
-        SkPaint* paintCopy =  mPaintMap.valueFor(paint);
+        SkPaint* paintCopy = mPaintMap.valueFor(paint);
         if (paintCopy == NULL || paintCopy->getGenerationID() != paint->getGenerationID()) {
             paintCopy = new SkPaint(*paint);
             mPaintMap.add(paint, paintCopy);