Merge "Remove static libs from link command"