am fe41fd53: Merge "Revert "Makefile changes to get mclinker to build again.""

* commit 'fe41fd537b9ffa9fef4b975f6ad2333e1452122b':
  Revert "Makefile changes to get mclinker to build again."