am c98d9a9d: am f1c09d7f: Merge "Add HOST_CROSS_OS"

* commit 'c98d9a9d0ff4ae5a99d45d79c43699c302e4e1a3':
  Add HOST_CROSS_OS