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

Change-Id: I553d7012098713013136e7d1ada433d2698b9eba