Revert of Gyp file changes for the android framework.

gyp/libwebp.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
-    'conditions':[
-      ['skia_android_framework == 1', {
-        'use_system_libwebp': 1,
-      }, {
-        'use_system_libwebp%': 0,
-      }],
-    ],
+    'use_system_libwebp%': 0,
   },
   'conditions': [
     ['use_system_libwebp==0', {
       'targets': [
         {
           'target_name': 'libwebp_dec',
           'type': 'static_library',
           'include_dirs': [
               '../third_party/externals/libwebp',
           ],
@@ skipping 131 matching lines @@
             'include_dirs': [
               '../third_party/externals/libwebp/src',
             ],
           },
           'conditions': [
             ['OS!="win"', {'product_name': 'webp'}],
           ],
         },
       ],
     }, {
-      # use_system_libwep == 1
       'targets': [
         {
           'target_name': 'libwebp',
           'type': 'none',
-          'conditions': [
-            [ 'skia_android_framework', {
-              'direct_dependent_settings': {
-                'libraries': [
-                  'libwebp-decode.a',
-                  'libwebp-encode.a',
-                ],
-              'include_dirs': [
-                'external/webp/include',
-              ],
-              },
-            }, { # skia_android_framework == 0
-              'direct_dependent_settings': {
-                'defines': [
-                  'ENABLE_WEBP',
-                ],
-                },
-                'link_settings': {
-                  'libraries': [
-                    '-lwebp',
-                  ],
-                },
-              },
+          'direct_dependent_settings': {
+            'defines': [
+              'ENABLE_WEBP',
             ],
-          ],
+          },
+          'link_settings': {
+            'libraries': [
+              '-lwebp',
+            ],
+          },
         }
       ],
     }],
   ],
 }