Update from https://crrev.com/327068

sandbox/linux/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//testing/test.gni")
 
 declare_args() {
   compile_suid_client = is_linux
 
@@ skipping 99 matching lines @@
       "bpf_dsl/cons_unittest.cc",
       "bpf_dsl/syscall_set_unittest.cc",
       "integration_tests/bpf_dsl_seccomp_unittest.cc",
       "integration_tests/seccomp_broker_process_unittest.cc",
       "seccomp-bpf-helpers/baseline_policy_unittest.cc",
       "seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc",
       "seccomp-bpf/bpf_tests_unittest.cc",
       "seccomp-bpf/errorcode_unittest.cc",
       "seccomp-bpf/sandbox_bpf_unittest.cc",
       "seccomp-bpf/syscall_unittest.cc",
+      "seccomp-bpf/trap_unittest.cc",
     ]
   }
   if (compile_credentials) {
     sources += [
       "integration_tests/namespace_unix_domain_socket_unittest.cc",
       "services/credentials_unittest.cc",
       "services/namespace_sandbox_unittest.cc",
       "services/namespace_utils_unittest.cc",
     ]
 
@@ skipping 10 matching lines @@
 }
 
 # This target is the shared library used by Android APK (i.e.
 # JNI-friendly) tests.
 shared_library("sandbox_linux_jni_unittests") {
   testonly = true
   deps = [
     ":sandbox_linux_unittests_sources",
   ]
   if (is_android) {
-    deps += [ "//testing/android:native_test_native_code" ]
+    deps += [ "//testing/android/native_test:native_test_native_code" ]
   }
 }
 
 component("seccomp_bpf") {
   sources = [
     "bpf_dsl/bpf_dsl.cc",
     "bpf_dsl/bpf_dsl.h",
     "bpf_dsl/bpf_dsl_forward.h",
     "bpf_dsl/bpf_dsl_impl.h",
     "bpf_dsl/codegen.cc",
@@ skipping 120 matching lines @@
       "services/namespace_utils.cc",
       "services/namespace_utils.h",
     ]
 
     deps += [ ":sandbox_services_headers" ]
   }
 }
 
 source_set("sandbox_services_headers") {
   sources = [
-    "system_headers/android_arm64_ucontext.h",
-    "system_headers/android_arm_ucontext.h",
-    "system_headers/android_futex.h",
-    "system_headers/android_i386_ucontext.h",
-    "system_headers/android_ucontext.h",
     "system_headers/arm64_linux_syscalls.h",
+    "system_headers/arm64_linux_ucontext.h",
     "system_headers/arm_linux_syscalls.h",
+    "system_headers/arm_linux_ucontext.h",
+    "system_headers/i386_linux_ucontext.h",
+    "system_headers/linux_futex.h",
     "system_headers/linux_seccomp.h",
+    "system_headers/linux_signal.h",
     "system_headers/linux_syscalls.h",
+    "system_headers/linux_ucontext.h",
     "system_headers/x86_32_linux_syscalls.h",
     "system_headers/x86_64_linux_syscalls.h",
   ]
 }
 
 # We make this its own target so that it does not interfere with our tests.
 source_set("libc_urandom_override") {
   sources = [
     "services/libc_urandom_override.cc",
     "services/libc_urandom_override.h",
@@ skipping 47 matching lines @@
   #      'type': 'none',
   #      'variables': {
   #        'test_suite_name': 'sandbox_linux_jni_unittests',
   #      },
   #      'dependencies': [
   #        'sandbox_linux_jni_unittests',
   #      ],
   #      'includes': [ '../../build/apk_test.gypi' ],
   #      }
 }