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

Change-Id: Iddb8a90281570eeca52e54a63ef36eede550e3fc