Merge "Fix demangle of function names."