Merge "Fix whole static lib handling of duplicate names."