am f41a670d: am 76274670: Merge "Fix LOCAL_MODULE_HOST_OS"

* commit 'f41a670d51559afb51e14890db12d85cc0a59aa2':
  Fix LOCAL_MODULE_HOST_OS