am d219db0b: Merge "Reapply: Makefile changes to get mclinker to build again."

* commit 'd219db0be93109d1851cc03eb972cdc42c83f0bb':
  Reapply: Makefile changes to get mclinker to build again.