Revert 35012 - Rearrange build configurations make it clearer and allow bett...

app/app_base.gypi

 # Copyright (c) 2009 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.
 
 {
   'target_defaults': {
     'variables': {
       'app_base_target': 0,
     },
     'target_conditions': [
@@ skipping 264 matching lines @@
           ],
           'include_dirs': [
             '../skia/config/win',
             '../third_party/icu/public/common',
             '../third_party/icu/public/i18n',
             '../third_party/npapi',
             '../third_party/skia/include/config',
             '../third_party/skia/include/core',
           ],
           'configurations': {
-            'Common_Base': {
+            'Common': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }