Merge "Update ld.config.txt for adbd apex" am: 7c7d1c600e am: 288daf9876

Change-Id: I5324f35018a186c12b926c3b8aaf8d49526cac07