Merge changes from topic 'rebase_r233350'

* changes:
  Fix up mclinker to build with LLVM r233350.
  Update mclinker for llvm rebase to r233350.