Revert "Temporarily disable NEON on Android framework builds."

gyp/opts.gyp

Index: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index c3f7b1b7bff58a3814046915b8e8ce06a4daec2d..3e319fccebcdf8a279aa3a0a4109ae1488eb3754 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -102,8 +102,7 @@
         }],
         [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \
             or (skia_os == "ios") \
-            or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"]) \
-            or (skia_android_framework and skia_arch_type == "arm64")', {
+            or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', {
           'sources': [
             '../src/opts/SkBitmapProcState_opts_none.cpp',
             '../src/opts/SkBlitMask_opts_none.cpp',
@@ -122,7 +121,7 @@
             '-mno-apcs-frame',
           ]
         }],
-        [ 'skia_arch_type == "arm64" and skia_android_framework == 0', {
+        [ 'skia_arch_type == "arm64"', {
           'sources': [
             '../src/opts/SkBitmapProcState_arm_neon.cpp',
             '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp',