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

Change-Id: I532d669cc4e3a024c78fa1bda6d16b3891fca855