Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

diff --combined nativebridge/bin/enable_nativebridge
index 01c41d2,76ca9cc..43d2b16
--- 1/nativebridge/bin/enable_nativebridge
--- 2/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@@ -9,14 -9,14 +9,14 @@@ binfmt_misc_dir=/proc/sys/fs/binfmt_mis
  if [ -z "$1" ]; then
        if [ "`uname -m`" = "x86_64" ]; then
                v=7_y
-               url=http://mrw.so/4HMwO9
+               url=http://tinyurl.com/16f0ntql
        else
                v=7_x
-               url=http://mrw.so/4Pige8
+               url=http://tinyurl.com/5gp5xo99
        fi
  else
        v=7_z
-       url=http://mrw.so/5jn810
+       url=http://tinyurl.com/yee4xnfw
  fi
  
  if [ -s /system/lib$1/libhoudini.so ]; then
@@@ -34,7 -34,7 +34,7 @@@ els
                while [ "$(getprop net.dns1)" = "" ]; do
                        sleep 10
                done
 -              wget $url -cO houdini$v.sfs && continue
 +              busybox wget $url -cO houdini$v.sfs && continue
                rm -f houdini$v.sfs
                sleep 30
        done