Revert of New build flag system, convert Google Now flag

chrome/chrome_android.gypi

 # Copyright (c) 2012 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': [
     {
       # GN: //chrome:chrome_android_core
       'target_name': 'chrome_android_core',
       'type': 'static_library',
       'dependencies': [
         'chrome.gyp:browser',
         'chrome.gyp:browser_ui',
         'chrome.gyp:child',
-        'chrome.gyp:chrome_common_features',
         'chrome.gyp:plugin',
         'chrome.gyp:renderer',
         'chrome.gyp:utility',
         # TODO(kkimlabs): Move this to chrome.gyp:browser when the dependent
         #                 is upstreamed.
         '../components/components.gyp:enhanced_bookmarks',
         '../content/content.gyp:content',
         '../content/content.gyp:content_app_both',
       ],
       'include_dirs': [
@@ skipping 67 matching lines @@
             '-f', '<(branding_path)',
             '-e', 'CHANNEL=str.upper("<(android_channel)")',
             '<(template_input_path)',
             '<(output_path)',
           ],
         },
       ],
     },
   ],
 }