Merge "Add ld.config.txt to rootdir/etc" am: 86559441a1
am: 3fd5bf0f82

Change-Id: If88cea58d006708fd7f31507cbcb3efd32293247