Reland "Gyp file changes for the android framework."

gyp/zlib.gyp

Index: gyp/zlib.gyp
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp
index eaa44c5fa285b2d2ccffe5318e0b046e91bd8f96..b26053eaf17dff16c595dfe1a88641f94f9ad91c 100644
--- a/gyp/zlib.gyp
+++ b/gyp/zlib.gyp
@@ -1,3 +1,4 @@
+# Target for including zlib.
 {
   'targets': [
     {
@@ -30,7 +31,16 @@
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "nacl"]', {
           'link_settings': { 'libraries': [ '-lz', ], },
-          'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
+          'conditions': [
+            [ 'skia_android_framework==0', {
+              'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
+            }],
+          ],
+        }],
+        [ 'skia_android_framework', {
+          'include_dirs': [
+            'external/zlib',
+          ],
         }],
       ],
     },