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

Change-Id: Ic83009db48c1b22c032f1bb6485dd61bc053b7ec