Fixes for GN Android build inputs/outputs

content/shell/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/module_args/v8.gni")
 import("//third_party/icu/config.gni")
 
 generate_jni("content_shell_jni_headers") {
@@ skipping 91 matching lines @@
       "$root_build_dir/natives_blob.bin",
       "$root_build_dir/snapshot_blob.bin",
     ]
     deps += [ "//v8" ]
   }
 }
 
 android_apk("content_shell_apk") {
   use_chromium_linker = true
   testonly = true
-  datadeps = [
+  data_deps = [
     # "//tools/android/forwarder",
   ]
   deps = [
     ":content_shell_apk_resources",
     ":content_shell_java",
     ":content_shell_apk_java",
     ":libcontent_shell_content_view",
     ":copy_content_shell_assets",
     "//base:base_java",
     "//content/public/android:content_java",
@@ skipping 27 matching lines @@
 }
 
 android_apk("content_shell_test_apk") {
   testonly = true
   deps = [
     "//content/public/android:content_javatests",
     "//base:base_javatests",
     "//net/android:net_javatests",
     "//testing/android/broker:broker_java",
   ]
-  datadeps = [
+  data_deps = [
     ":content_shell_apk",
     "//testing/android/driver:driver_apk",
   ]
   apk_under_test = ":content_shell_apk"
   apk_name = "ContentShellTest"
   android_manifest = "javatests/AndroidManifest.xml"
 }
 
 if (current_cpu != "x64" && current_cpu != "arm64") {
   chromium_linker_test_manifest =
@@ skipping 51 matching lines @@
 
   # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers
   generate_jni("linker_test_jni_headers") {
     testonly = true
     jni_package = "content/shell"
     sources = [
       "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java",
     ]
   }
 }