Merge "Fix DumpNativeStack function for traced methods. (part 2)" am: e36b4ae0b2 am: 39bb376e8e
am: 9c5923b58b

Change-Id: I5697bad1f1017d38d593a4a114fe8bb4d245ad61