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

diff --combined nativebridge/bin/enable_nativebridge
index 92693be,1b893ee..01c41d2
--- 1/nativebridge/bin/enable_nativebridge
--- 2/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@@ -22,7 -22,7 +22,7 @@@ f
  if [ -s /system/lib$1/libhoudini.so ]; then
        log -pi -thoudini "found /system/lib$1/libhoudini.so"
  elif [ -e /system/etc/houdini$v.sfs ]; then
-       mount /system/etc/houdini$v.sfs $dest_dir
+       mount -o ro /system/etc/houdini$v.sfs $dest_dir
  else
        if mountpoint -q $dest_dir; then
                kill -9 `fuser -m $dest_dir`
@@@ -30,11 -30,11 +30,11 @@@
        fi
        mkdir -p /data/arm
        cd /data/arm
-       while ! mount houdini$v.sfs $dest_dir; do
+       while ! mount -o ro houdini$v.sfs $dest_dir; do
                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