Merge "Remove unneeded links with dynamic libraries"