Merge "Revert "Properly de-duplicate debug symbol names.""
am: 2a1f258eb9

Change-Id: I17c558ea401d9d97ae9a7dd88ed443f4076ea0e9