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

Change-Id: I14bb9216120a7995102de90d5cb638f2e37852b8