am 6c5bbdd3: am 5fa17bce: Add in host side library as well.

Merge commit '6c5bbdd3d9fdd0d74a6519a329708b406d5294c6'

* commit '6c5bbdd3d9fdd0d74a6519a329708b406d5294c6':
  Add in host side library as well.