Follow renames of host libraries
am: 89c6d053f2

Change-Id: I0399039493e54eb7ee92b5855c16aaa6f583f3c9