Merge changes I49e4a1a6,I668a396c

* changes:
  fix builds on macOS when kernel modules are used
  package modules.alias onto device