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

* commit '9328c58e328cb978e98c13f4cd50fb9243b44d43':
  Stop using HOST_OS, whitelist windows modules