Merge "Fix linker_asan64 symlink" am: f517fcbbb6
am: 26a04f3549

Change-Id: If6f3afa151f40076f57727c7624df790694daf77