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

Change-Id: Ifc7523a36cd13a197291866833d5a3db4ae9d43c