Merge "Add missing host ldlibs" am: fc75f94643
am: 8355e6c097

Change-Id: Ic800a87350a7ada2c671ff7239e7447c98fd8c63