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

Change-Id: I3d95c3d88ee54be3efb64484a276fe3db883f484