Small fixes in mojo_shell for android.

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 5a7923018c6c982e1e16d9c536ba093d1e9bd1b3..71c962cfb6d96653838f360129925648c5ba0467 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -590,7 +590,7 @@
     },
     {
       'target_name': 'mojo_shell_tests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
@@ -612,6 +612,13 @@
         'shell/shell_test_base_unittest.cc',
         'shell/shell_test_main.cc',
       ],
+      'conditions': [
+        ['OS == "android"', {
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'mojo_service_manager_unittests',