Merge "Add missing host ldlibs" am: c830898c12 am: beeecbd623
am: b81e632687

Change-Id: I9df6bc25a3c866944399ac8ff4823b590a631493