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

diff --cc init.x86.rc
Simple merge

diff --cc packages.mk
index f13b836,0e9889a..c590b84
--- 1/packages.mk
--- 2/packages.mk
+++ b/packages.mk
@@@ -62,8 -77,15 +62,13 @@@ PRODUCT_PACKAGES += 
      mount.exfat \
      ntfs-3g \
      ntfsfix \
 -    resize2fs \
      tune2fs \
  
+ PRODUCT_PACKAGES += \
+     btattach \
+     hciconfig \
+     hcitool \
+ 
  # Third party apps
  PRODUCT_PACKAGES += \
 -    CMFileManager \
      Eleven \