Removes a couple of conflicting files from build

ui/gfx/gfx.gyp

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 390 matching lines @@
               '-landroid',
               '-ljnigraphics',
             ],
           },
         }],
         ['OS=="android" and use_aura==0', {
           'sources!': [
             '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',
           ],
         }],
         ['OS=="android" or OS=="ios"', {
           'sources!': [
             'render_text.cc',
             'render_text.h',
             'text_utils_skia.cc',
@@ skipping 62 matching lines @@
          'variables': {
            'jni_gen_package': 'ui/gfx',
            'jni_generator_ptr_type': 'long'
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },
      ],
     }],
   ],
 }