Merge 175820

content/content_app.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.
 
 {
   'include_dirs': [
     '..',
   ],
   'dependencies': [
     '../base/base.gyp:base',
@@ skipping 29 matching lines @@
       'sources!': [
         'app/content_main.cc',
       ],
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)/content',
       ],
       'dependencies': [
         'content.gyp:content_jni_headers',
         '../skia/skia.gyp:skia',
       ],
+      'includes': [
+        '../build/android/cpufeatures.gypi',
+      ],
     }],
     ['OS=="ios"', {
       'sources!': [
         'app/content_main.cc',
       ],
     }],
   ],
 }