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

Change-Id: Ib4115df73b2b94e1811c68906af182aeef919553