Merge "Revert "Properly de-duplicate debug symbol names."" am: 2a1f258eb9 am: 0b39a7bf7c
am: 61b2ae7ae5

Change-Id: If24a22b2dd0e9f7e6dc362745b5162cbc5337972