Merge "Provide a way to disassemble code in a tombstone." am: d98a584a6d
am: 8697036e17

Change-Id: Icb07db0fbf6a99b2b8ca690b1f3bd2789a7b2a36