skia_enable_android_framework_defines in all code, public and private, optional and required.

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 5544593e6ef2d704006acb9265c8fdea194c9fc5..c94f3cf9dfb64d579ad8fef75afc191e1175484a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -49,6 +49,9 @@ config("skia_public") {
   if (is_linux) {
     defines += [ "SK_SAMPLES_FOR_X" ]
   }
+  if (skia_enable_android_framework_defines) {
+    defines += skia_android_framework_defines
+  }
 }
 
 # Skia internal APIs, used by Skia itself and a few test tools.
@@ -224,11 +227,6 @@ template("optional") {
   }
 }
 
-optional("android_framework_defines") {
-  enabled = skia_enable_android_framework_defines
-  public_defines = skia_android_framework_defines
-}
-
 optional("fontmgr_android") {
   enabled = fontmgr_android_enabled
 
@@ -392,7 +390,6 @@ component("skia") {
   configs += skia_library_configs
 
   deps = [
-    ":android_framework_defines",
     ":arm64",
     ":armv7",
     ":avx",