Revert of Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp

gm/imagefiltersclipped.cpp

Index: gm/imagefiltersclipped.cpp
diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp
index 5401ef537f76be6e3c71a11ac8f58405703ac5ec..7c75bf3951a0b60b1a12f31c6fd950a0de3a0c4c 100644
--- a/gm/imagefiltersclipped.cpp
+++ b/gm/imagefiltersclipped.cpp
@@ -138,11 +138,11 @@
 
         SkPaint noisePaint;
         noisePaint.setShader(noise);
-        sk_sp<SkImageFilter> rectFilter(SkPaintImageFilter::Make(noisePaint));
+        SkAutoTUnref<SkImageFilter> rectFilter(SkPaintImageFilter::Create(noisePaint));
         canvas->translate(SK_ARRAY_COUNT(filters)*(r.width() + margin), 0);
         for (int xOffset = 0; xOffset < 80; xOffset += 16) {
             bounds.fLeft = SkIntToScalar(xOffset);
-            draw_clipped_filter(canvas, rectFilter.get(), 0, r, bounds);
+            draw_clipped_filter(canvas, rectFilter, 0, r, bounds);
             canvas->translate(0, r.height() + margin);
         }
     }