Merge "Revert "Temporarily disable mclinker (since nothing depends on it).""