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

Change-Id: I14bb9216120a7995102de90d5cb638f2e37852b8