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

gyp/android_deps.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-
 # This GYP file stores the dependencies necessary to build Skia on the Android
 # platform. The OS doesn't provide many stable libraries as part of the
 # distribution so we have to build a few of them ourselves.
 #
 # We tried adding this gyp file to the android directory at the root of
 # the Skia repo, but that resulted in the generated makefiles being created
 # outside of the intended output directory. So to avoid this we created a simple
 # shim here that includes the android_deps.gypi file.  The actual dependencies
 # are defined and maintained in that gypi file.
 #
@@ skipping 17 matching lines @@
           {
             'target_name': 'expat',
             'type': 'none',
             'direct_dependent_settings': {
               'libraries' : [
                 '-lexpat',
               ],
             },
           },
           {
+            'target_name': 'gif',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                'libgif.a',
+              ],
+              'include_dirs': [
+                'external/giflib',
+              ],
+            },
+          },
+          {
             'target_name': 'png',
             'type': 'none',
             'direct_dependent_settings': {
               'libraries' : [
                 '-lpng',
               ],
               'include_dirs': [
                 'external/libpng',
               ],
             },
@@ skipping 12 matching lines @@
           },
           {
             'target_name': 'cpu_features',
             'type': 'none',
           },
         ],
       }
     ],
   ],
 }