enable libjpeg for chromium x86 android build

libjpeg.gyp

 # 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.
 
 {
   'variables': {
     'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turbo',
     'conditions': [
       [ 'chromeos == 1 or (os_posix == 1 and \
         OS != "mac" and OS != "linux" and OS != "android")', {
@@ skipping 190 matching lines @@
               ],
               'variables': {
                 'yasm_path': '<(PRODUCT_DIR)/yasm',
                 'yasm_format': '-fmacho',
                 'yasm_flags': [
                   '-DMACHO',
                   '-Imac/'
                 ],
               },
             }],
-            [ 'OS=="linux"', {
+            [ 'OS=="linux" or (OS=="android" and target_arch!="arm")', {
               'conditions': [
                 [ 'use_system_yasm==0', {
                   'dependencies': [
                     '../yasm/yasm.gyp:yasm#host',
                   ],
                 }],
               ],
               'variables': {
                 'conditions': [
                   [ 'use_system_yasm==1', {
@@ skipping 69 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: