Separate non-SFI NaCl from SFI NaCl.

mojo/nacl/BUILD.gn

Index: mojo/nacl/BUILD.gn
diff --git a/mojo/nacl/BUILD.gn b/mojo/nacl/BUILD.gn
index a15bca247b8c1587b654e963aacdb8c39124af8a..b8df8b57f3a44e7639435efa6a35e850fb8ed891 100644
--- a/mojo/nacl/BUILD.gn
+++ b/mojo/nacl/BUILD.gn
@@ -105,6 +105,11 @@ static_library("irt_mojo_nonsfi") {
 group("mojo_nacl") {
   deps = [
     "//services/nacl:nacl_content_handler",
+  ]
+}
+
+group("mojo_nacl_nonsfi") {
+  deps = [
     "//services/nacl:nacl_content_handler_nonsfi",
   ]
 }
@@ -180,6 +185,12 @@ group("mojo_nacl_tests") {
   deps = [
     ":mojo_nacl_tests_untrusted(//build/toolchain/nacl:clang_newlib_${current_cpu})",
     ":monacl_shell",
+  ]
+}
+
+group("mojo_nacl_tests_nonsfi") {
+  testonly = true
+  deps = [
     ":monacl_shell_nonsfi_x86",
     ":monacl_test_nonsfi_nexes",
   ]