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