Merge "Properly de-duplicate debug symbol names."