Merge "Add demangling of function name." am: 6452b9036d am: e10835f28a
am: 174f78e4cc

Change-Id: Ia0eb87f68222f6dbcb9324e693996345ca89cb8b