Merge "Add missing host ldlibs"
am: c830898c12

Change-Id: Ied1df9b48b9bd710f4e1161feb6e38e925cedca1