Merge "Fix STL mismatch caught by new link_type check."