Support decoding subsets from JPG on Android.

tests/ImageDecodingTest.cpp

Index: tests/ImageDecodingTest.cpp
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index 2cf3e527a58c12d3cb8468d78c0c4894ae6d99f1..afab02f7a57fe434bae14f9dcd11cbed7fea1a61 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -225,10 +225,8 @@ static SkStream* create_image_stream(SkImageEncoder::Type type) {
 // Only runs in debug mode since we are testing for a crash.
 static void test_stream_life() {
     const SkImageEncoder::Type gTypes[] = {
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-        SkImageEncoder::kJPEG_Type,
-#endif
 #ifdef SK_BUILD_FOR_ANDROID
+        SkImageEncoder::kJPEG_Type,
         SkImageEncoder::kPNG_Type,
 #endif
         SkImageEncoder::kWEBP_Type,