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

gyp/core.gyp

Index: gyp/core.gyp
diff --git a/gyp/core.gyp b/gyp/core.gyp
index 14eda4bd3ce42f916c035df9cbe34ccf61ca4afd..7d322a6287c8ac544c1d63346d63351caff83c6e 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -79,11 +79,13 @@
           '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',
           ],