am 4379e2b8: Merge "Add LOCAL_MODULE_HOST_OS"

* commit '4379e2b8bbaf2a02777f189c758e251015eb7f76':
  Add LOCAL_MODULE_HOST_OS