am 21f54bf1: am 8e937939: Add in host library as well.

Merge commit '21f54bf13529077971e89b21f1af88d3b7532b84'

* commit '21f54bf13529077971e89b21f1af88d3b7532b84':
  Add in host library as well.