Merge "Fix DumpNativeStack function for traced methods." am: cf23c5d8e5
am: e52143bf19

Change-Id: I1daab589a2a8714cec4d0c192b417886c51271dd