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

Change-Id: Ie5ba33fe45bfaa069f3454e50b5eaf3ca5df1deb