Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799 am: 53cacfa  -s ours am: af857f6 am: 44e6cff am: 7e7a1fb
am: 83317d5

* commit '83317d5d74d48f121b6e994aa0baf3a5b567edcb':
  Don't demangle symbol names.