Revert of Build Mojo apps in subdirectories, like application packages.

mandoline/app/android/BUILD.gn

 # Copyright 2015 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.
 
 assert(is_android)
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//mojo/generate_mojo_shell_assets_list.gni")
 
@@ skipping 36 matching lines @@
     "$root_out_dir/lib.stripped/libmandoline_runner.so",
   ]
 }
 
 copy_ex("copy_mandoline_assets") {
   clear_dir = true
   dest = mandoline_assets_dir
   deps = [
     "//components/devtools_service",
     "//components/html_viewer",
+    "//components/view_manager",
+    "//components/view_manager/surfaces",
     "//mandoline/services/core_services",
     "//mojo/runner:bootstrap",
     "//mojo/runner:bootstrap_java",
+    "//mojo/services/network",
   ]
   sources = [
+    "$root_out_dir/core_services.mojo",
+    "$root_out_dir/devtools_service.mojo",
     "$root_out_dir/lib.stripped/libbootstrap.so",
+    "$root_out_dir/network_service.mojo",
     "$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar",
+    "$root_out_dir/surfaces_service.mojo",
   ]
 
   # Directories can't be specified as sources so pass manually to the script.
-  args = [
-    "--files=" + rebase_path("$root_out_dir/core_services", root_build_dir),
-    "--files=" + rebase_path("$root_out_dir/devtools_service", root_build_dir),
-    "--files=" + rebase_path("$root_out_dir/html_viewer", root_build_dir),
-  ]
+  args =
+      [ "--files=" + rebase_path("$root_out_dir/html_viewer", root_build_dir) ]
 
   if (use_aura) {
     deps += [
       "//mandoline/ui/browser",
       "//mandoline/ui/omnibox",
     ]
 
-    args += [
-      "--files=" + rebase_path("$root_out_dir/browser", root_build_dir),
-      "--files=" + rebase_path("$root_out_dir/omnibox", root_build_dir),
-    ]
+    args +=
+        [ "--files=" + rebase_path("$root_out_dir/browser", root_build_dir) ] +
+        [ "--files=" + rebase_path("$root_out_dir/omnibox", root_build_dir) ]
   }
 }
 
 generate_mojo_shell_assets_list("build_mandoline_assets") {
   deps = [
     ":copy_mandoline_assets",
   ]
   dir = mandoline_assets_dir
 }
 
@@ skipping 32 matching lines @@
     ":copy_mandoline_runner",
     ":java",
     ":mandoline_apk_resources",
     "//mojo/runner:java",
     "//mojo/runner:resources",
     "//base:base_java",
     "//third_party/android_tools:google_play_services_default_resources",
     "//ui/platform_window/android:platform_window_java",
   ]
 }