Android make sandbox/linux/seccomp-bpf compile on i386

sandbox/linux/sandbox_linux.gypi

Index: sandbox/linux/sandbox_linux.gypi
diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi
index a856ca8e9ccb8e72f51d47ce09132381ec329310..2fac989ab6397f764ee6ad0be81e0f9da6333b31 100644
--- a/sandbox/linux/sandbox_linux.gypi
+++ b/sandbox/linux/sandbox_linux.gypi
@@ -10,7 +10,7 @@
       }, {
         'compile_suid_client': 0,
       }],
-      ['((OS=="linux" or (OS=="android" and target_arch=="arm")) and '
+      ['((OS=="linux" or OS=="android") and '
              '(target_arch=="ia32" or target_arch=="x64" or '
               'target_arch=="arm"))', {
         'compile_seccomp_bpf': 1,
@@ -127,6 +127,7 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
+        'sandbox_services_headers',
       ],
       'include_dirs': [
         '../..',
@@ -166,6 +167,21 @@
         '..',
       ],
     },
+    { 'target_name': 'sandbox_services_headers',
+      'type': 'none',
+      'sources': [
+        'services/android_arm_ucontext.h',
+        'services/android_ucontext.h',
+        'services/android_i386_ucontext.h',
+        'services/arm_linux_syscalls.h',
+        'services/linux_syscalls.h',
+        'services/x86_32_linux_syscalls.h',
+        'services/x86_64_linux_syscalls.h',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+    },
     {
       # We make this its own target so that it does not interfere
       # with our tests.