am 0acdcd16: Merge "Stop using HOST_OS, whitelist windows modules"

* commit '0acdcd16af6bf984f78fb69dab957a1d74f0545d':
  Stop using HOST_OS, whitelist windows modules