Merge "Add option to print mangled function names" am: 823a8a6a89
am: 3ecfd17851

Change-Id: Ic7a5eb811cc25efb2a3b0d9565b6a308ab6ba1dd