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

Change-Id: I465aee0c808c892e520ce3e2574ae6fa0154e142