Merge "simpleperf: add test for a problem recording user stack." am: 549d13ff00
am: 459b57ac50

Change-Id: Ia19db7759edfab694572b163d7722fd3841f9fbc