am 60c61004: am e7154be8: Merge "Remove last HOST_OS check"

* commit '60c6100473658bc5978f760a8ef3a549fb539d7a':
  Remove last HOST_OS check