Merge "Use demangle for function names." am: daa6602a86 am: 7f717dfc83 am: 56b004c350
am: b5d73cffef

Change-Id: Ifdc5cdc6eb2e5adb49f7c0c1f2d15c34f9e6517d