Merge \\"simpleperf: fix unwind stack size.\\" am: 7be7fee1e7
am: a74db7d675

Change-Id: I4b9ee5ecffb1dbe5f8626bfee5e260ba6baeb568