Merge "simpleperf: fix according to unwindstack change."