Merge "Add ld.config.txt to /system/etc"
am: d444f8663d

Change-Id: I47a9dc4f028582575fb9da0c5a87103ed22c7945