Merge "Remove ld.config.txt from adbd APEX" am: 338bf075cf am: b6e75ea2cd

Change-Id: I9a3993b698fd75451ed0dd33f224eaba83bfcf2b