Revert of WIP: Added support for giflib, updated jpeg and png

gyp/giflib.gyp

Index: gyp/giflib.gyp
diff --git a/gyp/giflib.gyp b/gyp/giflib.gyp
index 9263835d2e8893382ebe97d34453f0b6568ffb5d..3a2c2153bf0ed6b52e5dc54c59e53ab15799babc 100644
--- a/gyp/giflib.gyp
+++ b/gyp/giflib.gyp
@@ -11,7 +11,7 @@
     {
       'target_name': 'giflib',
       'conditions': [
-        [ 'skia_android_framework == 0',
+        [ 'skia_giflib_static',
           {
             'type': 'static_library',
             'defines': [
@@ -35,18 +35,17 @@
               '../third_party/externals/giflib/gifalloc.c',
               '../third_party/externals/giflib/gif_err.c',
             ],
-          }, { # skia_android_framework
+          }, {  # not skia_giflib_static
             'type': 'none',
             'direct_dependent_settings': {
-              'libraries' : [
-                'libgif.a',
-              ],
-              'include_dirs': [
-                'external/giflib',
-              ]
-            }
+              'link_settings': {
+                'libraries': [
+                  '-lgif',
+                ],
+              },
+            },
           }
-        ]
+        ],
       ]
     }
   ]