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

Change-Id: I8f59558cda645fd7bc70bfcbb7010f8cb5af32e9