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

Change-Id: I35da84dceb546c04494e16106745b63cc80234b0