Merge "Revert "Properly de-duplicate debug symbol names.""