am 3f4df32a: Merge "Fix build break caused by MCLinker rebase."

* commit '3f4df32acb9846eae0154b2cebb146f26068280c':
  Fix build break caused by MCLinker rebase.