am 8e937939: Add in host library as well.

Merge commit '8e937939899d5fe3a6864c7ecb9bb8632678a7c7' into gingerbread-plus-aosp

* commit '8e937939899d5fe3a6864c7ecb9bb8632678a7c7':
  Add in host library as well.