Merge "Fix DumpNativeStack function for trampolines." am: 62d986b0a1
am: 2f374205a1

Change-Id: I0ff4e4e74edcc7da8270a29f1547691e077a3508