Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index fee27ca0269d4b5dc5b58c697c98f97cd34e8912..af7a2426f1dec515f11e7a56cd1d5163d4d13486 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -74,10 +74,6 @@
       'display/display_error_observer_chromeos.h',
       'display/display_info.cc',
       'display/display_info.h',
-      'display/display_layout.cc',
-      'display/display_layout.h',
-      'display/display_layout_builder.cc',
-      'display/display_layout_builder.h',
       'display/display_layout_store.cc',
       'display/display_layout_store.h',
       'display/display_manager.cc',
@@ -829,7 +825,6 @@
       'display/display_color_manager_chromeos_unittest.cc',
       'display/display_error_observer_chromeos_unittest.cc',
       'display/display_info_unittest.cc',
-      'display/display_layout_builder_unittest.cc',
       'display/display_manager_unittest.cc',
       'display/display_util_unittest.cc',
       'display/extended_mouse_warp_controller_unittest.cc',
@@ -978,6 +973,7 @@
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/base/ui_base.gyp:ui_data_pack',
         '../ui/compositor/compositor.gyp:compositor',
+        '../ui/display/display.gyp:display',
         '../ui/events/devices/events_devices.gyp:events_devices',
         '../ui/events/events.gyp:events',
         '../ui/events/events.gyp:events_base',
@@ -1038,7 +1034,6 @@
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
-            '../ui/display/display.gyp:display',
             '../ui/display/display.gyp:display_util',
           ],
         }, { # else: chromeos!=1
@@ -1176,6 +1171,7 @@
         '../ui/base/ui_base.gyp:ui_base_test_support',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/compositor/compositor.gyp:compositor_test_support',
+        '../ui/display/display.gyp:display',
         '../ui/events/devices/events_devices.gyp:events_devices',
         '../ui/events/events.gyp:events',
         '../ui/events/events.gyp:events_test_support',
@@ -1237,7 +1233,6 @@
             '../chromeos/chromeos.gyp:power_manager_proto',
             '../components/components.gyp:quirks',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
-            '../ui/display/display.gyp:display',
             '../ui/display/display.gyp:display_test_support',
             '../ui/display/display.gyp:display_test_util',
             '../ui/display/display.gyp:display_types',