Fix android shell tests after https://crrev.com/312398

shell/BUILD.gn

Index: shell/BUILD.gn
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index d494fc13220597cd8c22791aa49b23619ce29684..f38f2c999cec784759cd5736bdd4cd9bc480b453 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -26,6 +26,7 @@ group("shell") {
   if (is_android) {
     deps += [
       ":mojo_shell_apk",
+      ":mojo_shell_tests_apk",
     ]
   }
 }
@@ -333,6 +334,7 @@ if (is_android) {
 
     native_libs = [ "libmojo_shell.so" ]
 
+    asset_location = mojo_shell_assets_dir
 
     deps = [
       ":copy_mojo_shell",
@@ -434,14 +436,14 @@ test("mojo_shell_tests") {
   if (is_android) {
     sources += [ "android/background_application_loader_unittest.cc" ]
 
-    deps += [
-      ":jni_headers",
+    deps += [ ":jni_headers" ]
+
+    apk_deps = [
       ":copy_mojo_shell_test_assets",
       ":mojo_shell_tests_java",
-      "//testing/android:native_test_native_code",
     ]
 
-# TODO(qsr): asset_location = mojo_shell_assets_dir ?
+    apk_asset_location = mojo_shell_test_assets_dir
   }
 }