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

gyp/giflib.gyp

 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'skia_warnings_as_errors': 0,
   },
   'targets': [
     {
       'target_name': 'giflib',
       'conditions': [
-        [ 'skia_android_framework == 0',
+        [ 'skia_giflib_static',
           {
             'type': 'static_library',
             'defines': [
               'HAVE_CONFIG_H',
             ],
             'include_dirs': [
               '../third_party/externals/giflib',
             ],
             'dependencies': [
             ],
             'direct_dependent_settings': {
               'include_dirs': [
                 '../third_party/externals/giflib',
               ],
             },
             'cflags': [
               '-w',
             ],
             'sources': [
               '../third_party/externals/giflib/dgif_lib.c',
               '../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',
+                ],
+              },
+            },
           }
-        ]
+        ],
       ]
     }
   ]
 }