am 6e20e95b: Merge "Stop using HOST_OS, whitelist windows modules"

* commit '6e20e95b2fbea2636d568b0eaf0b9e23918b7393':
  Stop using HOST_OS, whitelist windows modules