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

Change-Id: I7889a08a6805a94740b87259312631b2ca0c12f6