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

ui/display/BUILD.gn

Index: ui/display/BUILD.gn
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index 6ecdbc6d9658f9744156cfef9734701a2e877800..9834c350996240fd0fe33363fff28d48bffa1fae 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -7,7 +7,6 @@ import("//testing/test.gni")
 
 component("display") {
   sources = [
-    "android/screen_android.cc",
     "chromeos/apply_content_protection_task.cc",
     "chromeos/apply_content_protection_task.h",
     "chromeos/configure_displays_task.cc",
@@ -117,9 +116,7 @@ component("display") {
   if (!use_aura) {
     sources -= [ "screen_aura.cc" ]
   }
-  if (is_android && use_aura) {
-    sources -= [ "android/screen_android.cc" ]
-  }
+
   if (is_mac) {
     libs = [
       "AppKit.framework",