Fix broken Android framework build.

gyp/expat.gyp

Index: gyp/expat.gyp
diff --git a/gyp/expat.gyp b/gyp/expat.gyp
index 90e4e44f41fa8f601d757a61b5929cf8247c184b..3eeed777b9241c4ac7ac06c8b5735230fb9b978d 100644
--- a/gyp/expat.gyp
+++ b/gyp/expat.gyp
@@ -6,8 +6,22 @@
 # Build expat from source.
 
 {
-    'targets': [{
-        'target_name': 'expat',
+    'targets': [
+    {
+      'target_name': 'expat',
+      'type': 'none',
+      'conditions': [
+        [ 'skia_android_framework', {
+            'dependencies':              [ 'android_deps.gyp:expat' ],
+            'export_dependent_settings': [ 'android_deps.gyp:expat' ],
+        },{
+            'dependencies':              [ 'expat.gyp:expat_static' ],
+            'export_dependent_settings': [ 'expat.gyp:expat_static' ],
+        }]
+      ]
+    },
+    {
+        'target_name': 'expat_static',
         'type': 'static_library',
         'cflags': [ '-Wno-missing-field-initializers' ],
         'xcode_settings': { 'WARNING_CFLAGS': [ '-Wno-missing-field-initializers', ], },