Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

Conflicts:
	nativebridge/bin/enable_nativebridge

diff --cc init.sh
Simple merge

diff --cc nativebridge/bin/enable_nativebridge
index c8899c6,1b893ee..b05563a
--- 1/nativebridge/bin/enable_nativebridge
--- 2/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@@ -6,24 -6,17 +6,24 @@@ houdini_bin=
  dest_dir=/system/lib$1/arm$1
  binfmt_misc_dir=/proc/sys/fs/binfmt_misc
  
-       mount -o 'context="u:object_r:system_file:s0"' $1 $2
 +urls[0]=http://t.cn/RBJ7mfG
 +urls[1]=http://t.cn/RBJ7eml
 +urls[2]=http://t.cn/RBJzLwu
 +urls[3]=http://goo.gl/96BPKe
 +urls[4]=http://goo.gl/v6c4Co
 +urls[5]=http://goo.gl/CtKjxx
 +
 +mount_sfs()
 +{
++      mount -o 'ro,context="u:object_r:system_file:s0"' $1 $2
 +}
 +
  if [ -z "$1" ]; then
 -      if [ "`uname -m`" = "x86_64" ]; then
 -              v=7_y
 -              url=http://mrw.so/4HMwO9
 -      else
 -              v=7_x
 -              url=http://mrw.so/4Pige8
 -      fi
 +      v=8_y
 +      u=1
  else
 -      v=7_z
 -      url=http://mrw.so/5jn810
 +      v=8_z
 +      u=2
  fi
  
  if [ -s /system/lib$1/libhoudini.so ]; then