Merge "Remove ld.config.txt from adbd APEX"