Merge "Update ld.config.txt for adbd apex"