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

diff --combined packages.mk
index dec38d0,3dd2df8..665a344
--- 1/packages.mk
--- 2/packages.mk
+++ b/packages.mk
@@@ -53,7 -53,6 +53,6 @@@ PRODUCT_PACKAGES := 
      power.x86 \
      rtk_hciattach \
      scp \
-     sensors.hsb \
      sftp \
      ssh \
      sshd \
@@@ -65,7 -64,6 +64,7 @@@
  PRODUCT_PACKAGES += \
      libwpa_client \
      hostapd \
 +    wificond \
      wpa_supplicant \
      wpa_supplicant.conf \