Merge "Script: Fix disassemble_tombstone.py" am: 9a2f49a71a
am: a5a9763fdb

Change-Id: I5faedcad47af81023323664c87dfba45646f7dde