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

* commit '05c10489f02137c99b9e927fe2d5a7165e94dc39':
  Stop using HOST_OS, whitelist windows modules