Follow renames of host libraries
am: e628c32aaf

Change-Id: I8711f80cb73293eddf7f62feb96569a5223c1f23