Revert of Mojo: Eliminate duplicate C API symbols

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': {
+  'includes': [
+    '../../mojo/mojo_variables.gypi',
+  ],
+  'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'gfx_geometry',
       'type': '<(component)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
       ],
       'defines': [
@@ skipping 589 matching lines @@
          ],
          'variables': {
            'jni_gen_package': 'ui/gfx',
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },
      ],
     }],
   ],
 }