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

Change-Id: I1defa232ac408da85327203ad4b8e1da472ea360