Merge "Use demangle for function names."