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

Change-Id: I29b8949065bb8be4ab3fc65f334164fa5050f4d4