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

src/images/SkImageDecoder.cpp

Index: src/images/SkImageDecoder.cpp
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index daeee9f0b9388de98e28af9247c2405e55fd8477..60cc44c5b4263f15fe58198cba6fc691608a9a19 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -206,8 +206,8 @@ bool SkImageDecoder::cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize,
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
 
     SkCanvas canvas(*dst);
-    canvas.drawSprite(*src, (srcX - dstX) / sampleSize,
-                            (srcY - dstY) / sampleSize,
+    canvas.drawBitmap(*src, SkIntToScalar((srcX - dstX) / sampleSize),
+                            SkIntToScalar((srcY - dstY) / sampleSize),
                             &paint);
     return true;
 }