Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/config/linux/pkg_config.gni

 # Copyright (c) 2013 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/sysroot.gni")
 
 # Defines a config specifying the result of running pkg-config for the given
 # packages. Put the package names you want to query in the "packages" variable
 # inside the template invocation.
 #
@@ skipping 25 matching lines @@
 pkg_config_script = "//build/config/linux/pkg-config.py"
 
 # Define the args we pass to the pkg-config script for other build files that
 # need to invoke it manually.
 if (sysroot != "") {
   # Pass the sysroot if we're using one (it requires the CPU arch also).
   pkg_config_args = [
     "-s",
     sysroot,
     "-a",
-    current_cpu,
+    cpu_arch,
   ]
 } else if (pkg_config != "") {
   pkg_config_args = [
     "-p",
     pkg_config,
   ]
 } else {
   pkg_config_args = []
 }
 
@@ skipping 17 matching lines @@
     }
 
     if (defined(invoker.defines)) {
       defines = invoker.defines
     }
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
   }
 }