am e7154be8: Merge "Remove last HOST_OS check"

* commit 'e7154be84a56008703b8d0705ca4bffd6bfd3c31':
  Remove last HOST_OS check