Enable SkUtilsArm on all ARM platforms and always use NDK compliant NEON dectection.

gyp/core.gyp

 # Core Skia library code.
 {
   'targets': [
     {
       'target_name': 'core',
       'product_name': 'skia_core',
       'type': 'static_library',
       'standalone_static_library': 1,
       'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
 
@@ skipping 61 matching lines @@
         }],
         [ 'skia_os == "win"', {
           'include_dirs': [
             'config/win',
           ],
         }],
         [ 'skia_os == "android"', {
           'sources': [
             '../src/core/SkPaintOptionsAndroid.cpp',
           ],
+          'dependencies': [
+            'android_deps.gyp:cpu_features',
+          ],
         }],
-        [ 'skia_os == "android" and skia_arch_type == "arm"', {
+        [ 'skia_arch_type == "arm"', {
           # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.
           'sources': [
-            '../src/core/SkPaintOptionsAndroid.cpp',
             '../src/core/SkUtilsArm.cpp',
             '../src/core/SkUtilsArm.h',
           ],
         }],
         ['skia_gpu == 1', {
           'include_dirs': [
               '../include/gpu',
               '../src/gpu',
           ],
         }],
@@ skipping 28 matching lines @@
       },
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: