am 3db2fc5a: Merge "Don\'t collect useless stack frames; do demangle C++ symbols."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '3db2fc5acb4894a2cb22533b165a0de1bbafc3f6':
  Don't collect useless stack frames; do demangle C++ symbols.