Update from https://crrev.com/308996

build/common.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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 621 matching lines @@
       # Variables to control Link-Time Optimizations (LTO).
       # Note: the variables must *not* be enabled at the same time.
       #       In this case LTO would 'merge' the optimization flags
       #       at link-time which would lead to all code be optimized with -O2.
       # Enable LTO on the code compiled with -Os.
       # See crbug.com/407544
       'use_lto%': 0,
       # Enable LTO on code compiled with -O2.
       'use_lto_o2%': 0,
 
+      # Libxkbcommon usage.
+      'use_xkbcommon%': 0,
+
       'conditions': [
         # A flag for POSIX platforms
         ['OS=="win"', {
           'os_posix%': 0,
         }, {
           'os_posix%': 1,
         }],
 
         # A flag for BSD platforms
         ['OS=="freebsd" or OS=="openbsd"', {
@@ skipping 47 matching lines @@
           'use_cairo%': 1,
         }],
 
         # DBus usage.
         ['OS=="linux" and embedded==0', {
           'use_dbus%': 1,
         }, {
           'use_dbus%': 0,
         }],
 
-        # Libxkbcommon usage.
-        ['use_ozone==1 and embedded==0', {
-          'use_xkbcommon%': 1,
-        }, {
-          'use_xkbcommon%': 0,
-        }],
-
         # We always use skia text rendering in Aura on Windows, since GDI
         # doesn't agree with our BackingStore.
         # TODO(beng): remove once skia text rendering is on by default.
         ['use_aura==1 and OS=="win"', {
           'enable_skia_text%': 1,
         }],
 
         # A flag to enable or disable our compile-time dependency
         # on gnome-keyring. If that dependency is disabled, no gnome-keyring
         # support will be available. This option is useful
@@ skipping 275 matching lines @@
         # Turn on JNI generation optimizations on non-WebView builds.
         ['OS=="android" and android_webview_build==0', {
           'optimize_jni_generation%': 1,
         }, {
           'optimize_jni_generation%': 0,
         }],
 
         # TODO(baixo): Enable v8_use_external_startup_data
         # http://crbug.com/421063
         ['android_webview_build==0 and android_webview_telemetry_build==0 and chromecast==0 and chromeos==0 and (OS=="android" or OS=="linux" or OS=="mac")', {
-          'v8_use_external_startup_data': 1,
+          'v8_use_external_startup_data%': 1,
         }, {
-          'v8_use_external_startup_data': 0,
+          'v8_use_external_startup_data%': 0,
         }],
       ],
 
       # Set this to 1 to enable use of concatenated impulse responses
       # for the HRTF panner in WebAudio.
       'use_concatenated_impulse_responses': 1,
 
       # You can set the variable 'use_official_google_api_keys' to 1
       # to use the Google-internal file containing official API keys
       # for Google Chrome even in a developer build.  Setting this
@@ skipping 184 matching lines @@
     'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)',
     'v8_optimized_debug%': '<(v8_optimized_debug)',
     'proprietary_codecs%': '<(proprietary_codecs)',
     'use_goma%': '<(use_goma)',
     'gomadir%': '<(gomadir)',
     'use_lto%': '<(use_lto)',
     'use_lto_o2%': '<(use_lto_o2)',
     'video_hole%': '<(video_hole)',
     'enable_load_completion_hacks%': '<(enable_load_completion_hacks)',
     'support_pre_M6_history_database%': '<(support_pre_M6_history_database)',
-    'v8_use_external_startup_data': '<(v8_use_external_startup_data)',
+    'v8_use_external_startup_data%': '<(v8_use_external_startup_data)',
 
     # Whether or not we are building the Athena shell.
     'use_athena%': '0',
 
     # Use system protobuf instead of bundled one.
     'use_system_protobuf%': 0,
 
     # Use system yasm instead of bundled one.
     'use_system_yasm%': 0,
 
@@ skipping 4617 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }