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

Change-Id: Id113e28518741db128b29fe2f9eb82627c02d980