Merge "simpleperf: fix cmd_debug_unwind tests." am: 01b1cb727c
am: 1248532bf6

Change-Id: I61d113a556322b8d430218b04e2e9ea5c4b4c8ec