Merge "Check available host libraries" am: b643f2caec
am: a8fd8de638

Change-Id: I4eba30e0c1b133abafb4ea5a0a7b6c55caee8a80