Merge "Add missing host ldlibs"
am: fc75f94643

Change-Id: I2c97415074b6540e438d4628ffc7bf771fe738f8