Merge "simpleperf: fix arm unwinding." am: 96bf860b97
am: 1f8b56c75a

Change-Id: Ie3f841bf8b34107e9667bc09a52ad1918ccd2e5a