Roll Chrome into Mojo.

build/android/ndk.gyp

Index: build/android/ndk.gyp
diff --git a/third_party/iccjpeg/iccjpeg.gyp b/build/android/ndk.gyp
similarity index 54%
copy from third_party/iccjpeg/iccjpeg.gyp
copy to build/android/ndk.gyp
index 780114858afb8778d8874f251f0a4b98aa41ebbe..2838a9857e991184cf3a7adf039b8d380dd6fb4b 100644
--- a/third_party/iccjpeg/iccjpeg.gyp
+++ b/build/android/ndk.gyp
@@ -1,24 +1,20 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2015 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.
 
 {
   'targets': [
     {
-      'target_name': 'iccjpeg',
+      'target_name': 'cpu_features',
       'type': 'static_library',
-      'dependencies': [
-        '<(libjpeg_gyp_path):libjpeg',
-      ],
-      'sources': [
-        'iccjpeg.c',
-        'iccjpeg.h',
-      ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '.',
+          '<(android_ndk_root)/sources/android/cpufeatures',
         ],
       },
+      'sources': [
+        '<(android_ndk_root)/sources/android/cpufeatures/cpu-features.c',
+      ],
     },
   ],
 }