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

ui/display/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/ui.gni")
 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",
     "chromeos/configure_displays_task.h",
     "chromeos/display_configurator.cc",
     "chromeos/display_configurator.h",
     "chromeos/display_layout_manager.h",
     "chromeos/display_snapshot_virtual.cc",
     "chromeos/display_snapshot_virtual.h",
     "chromeos/display_util.cc",
@@ skipping 89 matching lines @@
     deps += [ "//ui/events/platform" ]
   }
 
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
 
   if (!use_aura) {
     sources -= [ "screen_aura.cc" ]
   }
-  if (is_android && use_aura) {
-    sources -= [ "android/screen_android.cc" ]
-  }
+
   if (is_mac) {
     libs = [
       "AppKit.framework",
       "CoreGraphics.framework",
     ]
   }
 }
 
 component("display_manager_test_api") {
   testonly = true
@@ skipping 93 matching lines @@
     sources -= [ "display_change_notifier_unittest.cc" ]
   }
 
   if (is_chromeos && use_ozone) {
     sources -= [
       "chromeos/x11/display_util_x11_unittest.cc",
       "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
     ]
   }
 }