Remove dependencies on Android's forked decoder libraries

gyp/images.gyp

Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 3c46ec1a8f0bf659bedc21feea5f1ab9278a5ed9..6f1151403265cce4aaff9a35aa6f4ecd9d0f7a76 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -14,7 +14,7 @@
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
-        'libjpeg.gyp:*',
+        'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
         'etc1.gyp:libetc1',
         'ktx.gyp:libSkKTX',
         'libwebp.gyp:libwebp',
@@ -116,9 +116,6 @@
           ],
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
-          'export_dependent_settings': [
-            'libpng.gyp:libpng',
-          ],
           'dependencies': [
             'libpng.gyp:libpng',
           ],
@@ -128,9 +125,6 @@
           'include_dirs': [
              '../src/utils',
           ],
-          'dependencies': [
-             'android_deps.gyp:png',
-          ],
           'cflags' : [
             # SkImageDecoder_libpng includes png.h.
             # In the version of libpng that we use on Android (1.2.46),
@@ -138,13 +132,11 @@
             # in png.h, triggering a warning in C++11.
             '-Wno-literal-suffix',
           ],
+          'dependencies': [
+            'libpng.gyp:libpng',
+          ],
           'conditions': [
-            [ 'skia_android_framework == 0', {
-              'export_dependent_settings': [
-                'android_deps.gyp:png',
-                'libjpeg.gyp:*'
-              ],
-            }, {
+            [ 'skia_android_framework == 1', {
               # The android framework disables these decoders as they are of little use to
               # Java applications that can't take advantage of the compressed formats.
               'sources!': [