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

Change-Id: I92291c853973747891490ab0b9fafca4a15dd7a0