Merge "Fix APEX run-time ld.config.txt for ASAN targets" am: 8540f50887 am: 321b1a6345
am: 5d42b599ef

Change-Id: Ie571a679d43de4f34f119647040bbacea6a4f010