Merge "Add demangling of function name."