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

Change-Id: Ia652107bc88d04012d3d16bc146ff98bc3bc15cf