am a908fb00: am 05c10489: Merge "Stop using HOST_OS, whitelist windows modules"

* commit 'a908fb00a989ea209573c72b8a50ebbddec93d2b':
  Stop using HOST_OS, whitelist windows modules