Follow renames of host libraries
am: e7472b52fa

Change-Id: I5e7a513cc42b13b3ea5ae6620f54cd4ecc214b90