Merge "Fix build break caused by MCLinker rebase."