GN: Add mojo_shell_tests, get more things working on android

mojo/services/public/cpp/geometry/BUILD.gn

Index: mojo/services/public/cpp/geometry/BUILD.gn
diff --git a/mojo/services/public/cpp/geometry/BUILD.gn b/mojo/services/public/cpp/geometry/BUILD.gn
index 5f8a9b96fa42f31293386eb50265411bdb42aa98..21cf5d97613d4f6a6b19d6c45fa6c0b050c05b4e 100644
--- a/mojo/services/public/cpp/geometry/BUILD.gn
+++ b/mojo/services/public/cpp/geometry/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//mojo/system.gni")
+
 component("geometry") {
   output_name = "mojo_geometry_lib"
 
@@ -12,6 +14,7 @@ component("geometry") {
     "//mojo/environment:chromium",
     "//mojo/services/public/interfaces/geometry",
   ]
+  deps += mojo_system_for_component
 
   forward_dependent_configs_from = [ "//ui/gfx" ]
 
@@ -24,8 +27,4 @@ component("geometry") {
     "geometry_type_converters.h",
     "mojo_geometry_export.h",
   ]
-
-  if (is_component_build) {
-    deps += [ "//mojo/system" ]
-  }
 }