Add skia_use_android_framework_defines GYP_DEFINE

gyp/common_conditions.gypi

Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index ba4337403d99621a1c1ed291715a1c919cd459b5..2c88a973f9c738f42eb32e54e074e5c1ef13b822 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -331,9 +331,6 @@
     ],
 
     ['skia_android_framework', {
-      'includes' : [
-        'skia_for_android_framework_defines.gypi',
-      ],
       'cflags': [
         # Skia does not enforce this usage pattern so we disable it here to avoid
         # unecessary log spew when building
@@ -396,7 +393,18 @@
         # this define globally and the the implemention define as a cflag.
         'SKIA_DLL',
         'SK_PRINT_CODEC_MESSAGES',
-        # Defines from skia_for_android_framework_defines.gypi
+      ],
+    }],
+
+    ['skia_use_android_framework_defines', {
+      # Add these defines when building for the Android framework, or when
+      # specifically requested. These should be temporary staging defines. Any
+      # permanent defines should be moved into the skia_android_framework block
+      # above.
+      'includes' : [
+        'skia_for_android_framework_defines.gypi',
+      ],
+      'defines': [
         '<@(skia_for_android_framework_defines)',
       ],
     }],