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

Change-Id: Ib260f3b036c5d296b53dcb2ea090e3f46d23726c