Merge "simpleperf: fix according to unwindstack change." am: 51c7cad7e8

Change-Id: I912bbfca8befdbe5f9c69bb4ce13c9b6b6df9f79