Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799
am: 53cacfa  -s ours

* commit '53cacfa3037ef75b783d72307177a215fc02f070':
  Don't demangle symbol names.