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

Change-Id: I1d67a1f2395962c5fda76394447a2deb47481259