Merge "Use elf offset in signal step check." am: 25cd25168a
am: 1a50483791

Change-Id: I8901239966c325616f8115e1884c2e196acae020