Reland of Android: support multiple displays on C++ side

content/shell/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/console_app.gni")
 import("//build/config/win/manifest.gni")
 import("//media/media_options.gni")
@@ skipping 290 matching lines @@
     # Some tests rely on this tool at runtime. Note: it might be better if
     # the tests that needed it had this as a dep instead of adding it here.
     data_deps = [
       "//tools/xdisplaycheck",
     ]
 
     deps += [ "//ui/events/devices/x11" ]
   }
 
   if (is_android) {
-    deps += [ "//content/shell/android:content_shell_jni_headers" ]
+    deps += [
+      "//content/shell/android:content_shell_jni_headers",
+      "//ui/android:android",
+    ]
   }
 
   if (is_posix && !is_mac) {
     deps += [
       "//components/crash/content/app",
       "//components/crash/content/browser",
     ]
   }
 
   if (use_aura) {
@@ skipping 420 matching lines @@
       "{{bundle_resources_dir}}/{{source_file_part}}",
     ]
   }
 }
 
 mojom("mojo_bindings") {
   sources = [
     "common/layout_test/layout_test_bluetooth_fake_adapter_setter.mojom",
   ]
 }