Merge "Fix demangle of function names."
am: b3959bb47e

Change-Id: Iaa788fa1b2bac2d2012be68e4e1231e325dd0930