Removes a couple of conflicting files from build

BUG=none
TEST=none
R=ben@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244322 0039d316-1c4b-4281-b951-d872f2087c98

ui/gfx/gfx.gyp

@@ -408,6 +408,11 @@
             'path.cc',
           ],
         }],
+        ['OS=="android" and use_aura==1', {
+          'sources!': [
+            'screen_android.cc',
+          ],
+        }],
         ['OS=="android" and android_webview_build==0', {
           'dependencies': [
             '<(DEPTH)/base/base.gyp:base_java',

ui/ui.gyp

@@ -592,6 +592,11 @@
             'base/cursor/cursor_android.cc'
           ],
         }],
+        ['OS=="android" and use_aura==1', {
+          'sources!': [
+            'base/clipboard/clipboard_aura.cc'
+          ],
+        }],
         ['OS=="android" or OS=="ios"', {
           'sources!': [
             'base/device_form_factor_desktop.cc'