Fix Android roll

- only depend on cpu-features when we know we have an NDK
    - disable SkSplicer

Change-Id: I89e4cc70d6ddf0ebb7005d1cb453768d946cd205
Reviewed-on: https://skia-review.googlesource.com/7060
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

BUILD.gn

@@ -646,10 +646,10 @@ component("skia") {
   }
 
   if (is_android) {
-    deps += [
-      "//third_party/cpu-features",
-      "//third_party/expat",
-    ]
+    deps += [ "//third_party/expat" ]
+    if (is_skia_standalone && ndk != "") {
+      deps += [ "//third_party/cpu-features" ]
+    }
     sources += [ "src/ports/SkDebug_android.cpp" ]
     libs += [
       "EGL",

gn/gn_to_bp.py

@@ -108,6 +108,7 @@ cc_library {
 
 # We'll run GN to get the main source lists and include directories for Skia.
 gn_args = {
+  'skia_enable_splicer':             'false',
   'skia_enable_vulkan_debug_layers': 'false',
   'skia_use_system_expat':           'true',
   'skia_use_vulkan':                 'true',