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

diff --cc modules.blacklist
index 574d566,97a2a6e..6303827
--- 1/modules.blacklist
--- 2/modules.blacklist
+++ b/modules.blacklist
@@@ -1,4 -1,5 +1,4 @@@
  blacklist evbug
  deferred  amdgpu
- deferred  nouveau
+ blacklist nouveau
  deferred  radeon
 -deferred  soc_button_array