Merge "Remove ld.config.txt from adbd APEX" am: 5694a9559b am: 187bf6c184

Change-Id: I9a3993b698fd75451ed0dd33f224eaba83bfcf2b