Revert[2] of "stop using drawSprite (at least w/ no filters) as it is going away"

src/effects/SkMergeImageFilter.cpp

Index: src/effects/SkMergeImageFilter.cpp
diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
index e99991898c288a167d97b917da87c673ec687c40..d6f0eaa794bcacaa7801d993bb15fe3cece0e98b 100755
--- a/src/effects/SkMergeImageFilter.cpp
+++ b/src/effects/SkMergeImageFilter.cpp
@@ -91,7 +91,7 @@ bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
         } else {
             paint.setXfermode(nullptr);
         }
-        canvas.drawSprite(input, pos.x() - x0, pos.y() - y0, &paint);
+        canvas.drawBitmap(input, SkIntToScalar(pos.x() - x0), SkIntToScalar(pos.y() - y0), &paint);
         didProduceResult = true;
     }