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

* commit '7488ffd672ad1146d8a615f03a96a79794cd0d73':
  Fix mclinker build based on the current merge point (6824c79120).