Merge "Add offset for native stack dump." am: faf76cbe55
am: 8b21ddccd4

Change-Id: I6de9e9ba23fabf73f53f9584daa873e01382aa79