Follow renames of host libraries am: 89c6d053f2 am: b7ac6209ce
am: aea457c85a

Change-Id: I292c1ea9946b7e5716aa97ceff15445ae64f8424