Merge "Add missing host ldlibs"
am: 044d80e37a

Change-Id: Iaae9cea52bd00f8d51f268414fed2c8c3b9d48dc