[AUTO UPDATE] Copying from upstream Mojo Repository.
d2811953d617f6cc35482b2ae49786ff42197e7a
  Tue, 14 Jun 2016 11:16:08 -0700, viettrungluu@chromium.org
  Nuke NaCl SFI, part 1.

config/nacl/config.gni

diff --git a/config/nacl/config.gni b/config/nacl/config.gni
index 652c37a..24529c3 100644
--- a/config/nacl/config.gni
+++ b/config/nacl/config.gni
@@ -10,9 +10,10 @@
 
   # TODO(ncbray): support ASAN once NaCl's GN build is unforked.
   # TODO(cstout): support fnl/musl build in nacl
-  mojo_use_nacl_sfi = is_linux && !is_asan && !is_fnl
   mojo_use_nacl_nonsfi = (is_linux || is_android) && !is_asan && !is_fnl
-  mojo_use_nacl = mojo_use_nacl_sfi || mojo_use_nacl_nonsfi
+
+  # TODO(vtl): This now seems totally redundant.
+  mojo_use_nacl = mojo_use_nacl_nonsfi
 }
 
 nacl_toolchain_dir = "//native_client/toolchain/${host_os}_x86"