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

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