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

Change-Id: I793a924d25b43cf272d9ec09f7560f9f14a6d58e