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

Change-Id: I04c96c44d6dd72ab7acd8d8f4a76534e0d35e31b