Chromium roll (https://codereview.chromium.org/976353002)

sky/engine/config.gni

 # 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.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
 }
 
-if (cpu_arch == "arm") {
+if (target_cpu == "arm") {
   import("//build/config/arm.gni")
 } else {
   # TODO(brettw) remove this once && early-out is checked in.
   arm_version = 0
 }
 
 declare_args() {
   # Enable asserts, even in release builds.
   sky_asserts_always_on = false
 
@@ skipping 25 matching lines @@
 }
 
 # feature_defines_string -------------------------------------------------------
 
 # Convert the list to a space-separated string for passing to scripts.
 # This would be the equivalent of passing '<(feature_defines)' in GYP.
 feature_defines_string =
     exec_script("build/gn_list_to_space_separated_string.py",
                 feature_defines_list,
                 "trim string")