Revert of Run mojo unit tests on the Android main waterfall. (patchset #2 id:20001 of https://codereview.chromium.org/1145343005/)

Reason for revert:
http://build.chromium.org/p/chromium.linux/builders/Android%20GN/builds/26585/steps/compile/logs/stdio#error1

ninja:error: unknown target 'html_viewer_unittests_apk'

Original issue's description:
> Run mojo unit tests on the Android main waterfall.
>
> Run Mojo additional unit tests on the "Android GN" bot:
> http://build.chromium.org/p/chromium.linux/builders/Android%20GN
> (No CQ yet; need Android GN testing support/devices there...)
> Add the necessary target mappings to ninja_to_gn.pyl
>
> Similar tests already run on Linux GN and our chromium.mojo FYI:
> http://build.chromium.org/p/chromium.linux/builders/Linux%20GN
> http://build.chromium.org/p/chromium.mojo/builders/Chromium%20Mojo%20Android
>
> BUG=478244,359249
> TEST=Steps run and pass on the bot.
> R=dpranke@chromium.org
>
> Committed: https://crrev.com/e1d8b35e1745d299ef346b1b6b6d116f417d2664
> Cr-Commit-Position: refs/heads/master@{#335112}

TBR=dpranke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=478244,359249

Review URL: https://codereview.chromium.org/1177923004

Cr-Commit-Position: refs/heads/master@{#335117}

2 files changed, 0 insertions, 45 deletions

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index b8440ed..16f6b8c 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -6,46 +6,7 @@
     ],
     "gtest_tests": [
       {
-        "test": "html_viewer_unittests"
-      },
-      {
-        "test": "ipc_mojo_unittests"
-      },
-      {
         "test": "mojo_common_unittests"
-      },
-      {
-        "test": "mojo_public_application_unittests"
-      },
-      {
-        "test": "mojo_public_bindings_unittests"
-      },
-      {
-        "test": "mojo_public_environment_unittests"
-      },
-      {
-        "test": "mojo_public_system_unittests"
-      },
-      {
-        "test": "mojo_public_utility_unittests"
-      },
-      {
-        "test": "mojo_runner_unittests"
-      },
-      {
-        "test": "mojo_shell_unittests"
-      },
-      {
-        "test": "mojo_surfaces_lib_unittests"
-      },
-      {
-        "test": "mojo_system_unittests"
-      },
-      {
-        "test": "resource_provider_unittests"
-      },
-      {
-        "test": "view_manager_unittests"
       }
     ]
   },
diff --git a/testing/buildbot/ninja_to_gn.pyl b/testing/buildbot/ninja_to_gn.pyl
index 53f5dde..97f50fe 100644
--- a/testing/buildbot/ninja_to_gn.pyl
+++ b/testing/buildbot/ninja_to_gn.pyl
@@ -48,7 +48,6 @@
   "gn_unittests":                      "//tools/gn:gn_unittests",
   "google_apis_unittests":             "//google_apis:google_apis_unittests",
   "gpu_unittests":                     "//gpu:gpu_unittests",
-  "html_viewer_unittests":             "//components/html_viewer:tests",
   "installer_util_unittests":          "//chrome/installer/util:installer_util_unittests",
   "interactive_ui_tests":              "//chrome/test:interactive_ui_tests",
   "ipc_mojo_unittests":                "//ipc/mojo:ipc_mojo_unittests",
@@ -63,9 +62,6 @@
   "mojo_public_environment_unittests": "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
   "mojo_public_system_unittests":      "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
   "mojo_public_utility_unittests":     "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
-  "mojo_runner_unittests":             "//mojo/runner:tests",
-  "mojo_shell_unittests":              "//mojo/shell:tests",
-  "mojo_surfaces_lib_unittests":       "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests",
   "mojo_system_unittests":             "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",
   "message_center_unittests":          "//ui/message_center:message_center_unittests",
   "nacl_loader_unittests":             "//components/nacl:nacl_loader_unittests",
@@ -74,7 +70,6 @@
   "ppapi_unittests":                   "//ppapi:ppapi_unittests",
   "printing_unittests":                "//printing:printing_unittests",
   "remoting_unittests":                "//remoting:remoting_unittests",
-  "resource_provider_unittests":       "//components/resource_provider:tests",
   "sandbox_linux_unittests":           "//sandbox/linux:sandbox_linux_unittests",
   "sandbox_mac_unittests":             "//sandbox/mac:sandbox_mac_unittests",
   "sbox_integration_tests":            "//sandbox/win:sbox_integration_tests",
@@ -89,7 +84,6 @@
   "ui_touch_selection_unittests":      "//ui/touch_selection:ui_touch_selection_unittests",
   "unit_tests":                        "//chrome/test:unit_tests",
   "url_unittests":                     "//url:url_unittests",
-  "view_manager_unittests":            "//components/view_manager:view_manager_unittests",
   "views_unittests":                   "//ui/views:views_unittests",
   "webkit_unit_tests":                 "//third_party/WebKit/public:webkit_unit_tests",
   "wm_unittests":                      "//ui/wm:wm_unittests",