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

Change-Id: I08ec5e3ce262035883d3207ffa9b6f0eb1b22269