Put thunk targets directly into loadable modules in static build

mojo/mojo_variables.gypi

 # 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.
 
 #
 # A set of GYP variables that are shared between mojo.gyp and mojo_base.gyp
 #
 {
   'variables': {
     'chromium_code': 1,
@@ skipping 17 matching lines @@
       # static library, and in that case, it is expected that the target
       # listing the component as a dependency will specify either mojo_system
       # or mojo_system_impl to link against. This enables multiple targets to
       # link against the same component library without having to agree on
       # which Mojo system library they are using.
       #
       ['component=="shared_library"', {
         'mojo_system_for_component': "mojo_base.gyp:mojo_system_impl",
         'mojo_system_for_loadable_module': "mojo_base.gyp:mojo_system_impl",
         'mojo_gles2_for_component': "mojo_base.gyp:mojo_gles2_impl",
-        'mojo_gles2_for_loadable_module': "mojo_base.gyp:mojo_gles2_impl",
       }, {
         'mojo_system_for_component': "mojo_base.gyp:mojo_none",
         'mojo_system_for_loadable_module': "mojo_base.gyp:mojo_system",
         'mojo_gles2_for_component': "mojo_base.gyp:mojo_none",
-        'mojo_gles2_for_loadable_module': "mojo_base.gyp:mojo_gles2",
       }],
     ],
   },
 }