Merge "CallStack: include prefix/tag when unlinked"
am: 1476931e02

Change-Id: I386a6b343e8a1de1fd282ec61d3f63601b97f4da