Fix BMP RLE bug: attempt 2

BUG=skia:

Review URL: https://codereview.chromium.org/1457213003
diff --git a/src/codec/SkBmpRLECodec.cpp b/src/codec/SkBmpRLECodec.cpp
index 2e04b8b..4cee274 100644
--- a/src/codec/SkBmpRLECodec.cpp
+++ b/src/codec/SkBmpRLECodec.cpp
@@ -349,7 +349,7 @@
                     y++;
                     break;
                 case RLE_EOF:
-                    return y;
+                    return height;
                 case RLE_DELTA: {
                     // Two bytes are needed to specify delta
                     if ((int) fRLEBytes - fCurrRLEByte < 2) {