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

Change-Id: Ibe06634066d1e7dfb22986732ac8b4533a7431c1