am 76274670: Merge "Fix LOCAL_MODULE_HOST_OS"

* commit '762746705c7414985dbd457481dd33d4c69adcbb':
  Fix LOCAL_MODULE_HOST_OS