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

Change-Id: Ida222ccfdcf5199571805ee9912708998ae21553