Revert of Gyp file changes for the android framework.

Revert of Gyp file changes for the android framework. (https://codereview.chromium.org/153093003/)

Reason for revert:
Android fails to run bench and bench_pictures. I need to figure out why.

Original issue's description:
> Gyp file changes for the android framework.
> 
> Split off from https://codereview.chromium.org/140503007/.
> 
> The eventual goal is to create our Android.mk from gyp. This patch
> adds an option for skia_android_framework with the right settings.
> The follow-up (https://codereview.chromium.org/140503007/) will
> use scripts to create the final makefile.
> 
> gyp/android_deps.gyp:
> Use different dependencies for the framework than for building Skia
> normally.
> 
> gyp/android_framework_lib.gyp:
> Like skia_lib, specifies the minimum needed for building Skia, in this
> case for the framework.
> 
> gyp/common_conditions.gypi:
> Add settings specific to skia_android_framework. In some cases this
> means turning off flags and defines.
> 
> gyp/common.gypi
> Turn off SK_DEBUG and SK_DEVELOPER when building for the framework.
> This allows the framework to create a single makefile which can be
> modified to add SK_DEBUG and SK_DEVELOPER as desired.
> 
> gyp/common_variables.gypi:
> Add skia_android_framework.
> 
> gyp/core.gyp:
> Don't depend on cpufeatures, and add the cutils library for
> skia_android_framework.
> 
> gyp/freetype.gyp:
> skia_android_framework-specific options:
> Don't include freetype_static as a dependency.
> Include the proper folders.
> Include the android library.
> 
> gyp/images.gyp:
> Don't export libjpeg as a dependency for targets that include images
> for the framework.
> Also reorder image decoders to match the Android order, leaving our
> most commonly used ones last (and therefore first in the chain for
> trying them).
> 
> gyp/libwebp.gyp:
> Use the system webp when building for the Android framework. Specify
> the correct settings for the framework.
> 
> gyp/opts.gyp:
> Specify a default set of files to compile when there are no possible
> optimizations.
> 
> gyp/pdf.gyp:
> Add dependencies for Android framework.
> 
> gyp/zlib.gyp:
> Include the zlib folder, and undefine SK_ZLIB_INCLUDE.
> 
> BUG=skia:1975
> R=djsollen@google.com
> 
> Committed: https://code.google.com/p/skia/source/detail?r=13298

TBR=halcanary@google.com,djsollen@google.com,epoger@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:1975
Committed (with the wrong name) with https://code.google.com/p/skia/source/detail?r=13304

[scroggo, 2014-02-04 15:33:44]

Created Revert of Gyp file changes for the android framework.

[skia-commit-bot, 2014-02-04 15:33:46]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/scroggo@google.com/153923002/1

[skia-commit-bot, 2014-02-04 15:33:48]

The CQ bit was unchecked by skia-commit-bot@chromium.org

[skia-commit-bot, 2014-02-04 15:33:48]

Failed to apply patch for gyp/android_deps.gyp:
While running git apply --index -p1;
  error: gyp/android_deps.gyp: does not exist in index

Patch:       gyp/android_deps.gyp
Index: gyp/android_deps.gyp
diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp
index
1669b2bdad1704164362e8f62307b03a0ee6c797..cd5b1b0c693c483850957c936265cfbec5aaafc7
100644
--- a/gyp/android_deps.gyp
+++ b/gyp/android_deps.gyp
@@ -14,68 +14,7 @@
 # This is due to the fact that we cannot use variables in an includes as the
 # variable expansion step for gyp happens after the includes are processed.
 {
-  'conditions': [
-    [ 'skia_android_framework == 0',
-      {
-        'includes': [
-          '../platform_tools/android/gyp/dependencies.gypi',
-        ],
-      }, { # else skia_android_framework
-        'cflags': [
-          '-Wno-error'
-        ],
-        'targets': [
-          {
-            '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',
-              ],
-            },
-          },
-          {
-            'target_name': 'jpeg',
-            'type': 'none',
-            'direct_dependent_settings': {
-              'libraries' : [
-                '-ljpeg',
-              ],
-              'include_dirs': [
-                'external/jpeg',
-              ],
-            },
-          },
-          {
-            'target_name': 'cpu_features',
-            'type': 'none',
-          },
-        ],
-      }
-    ],
+  'includes': [
+    '../platform_tools/android/gyp/dependencies.gypi',
   ],
 }