Merge "Fix mclinker build based on the current merge point (6824c79120)."