am 97ca1d01: am 1162db78: Merge "Stop checking HOST_OS"

* commit '97ca1d015da938a1f2607abb910fd3205570dac4':
  Stop checking HOST_OS