To enable x86 android build for libvpx.gyp

libvpx.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': {
     'conditions': [
       ['os_posix==1', {
         'asm_obj_extension': 'o',
       }],
       ['OS=="win"', {
         'asm_obj_extension': 'obj',
       }],
     ],
   },
   'conditions': [
-    [ 'OS != "android" and target_arch != "arm"', {
+    [ 'target_arch != "arm"', {
       'targets': [
         {
           # This libvpx target contains both encoder and decoder.
           # Encoder is configured to be realtime only.
           'target_name': 'libvpx',
           'type': 'static_library',
           'variables': {
             'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx',
             'variables': {
               'conditions': [
@@ skipping 259 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: