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

Change-Id: I3fee43fe2740e581b7c134ba15b302b180a4deb0