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

Change-Id: Ib5be28663773cbee7cd87bbe44f071c3c6c80bf3