Merge "Removed unused part in ld.config.txt.in" am: 8fa3e72846 am: 7b7339d339
am: ebf514bab3

Change-Id: Ib94c656453658409081f6820a5901ab75de8fa60