Merge "simpleperf: fix flaky record_native_app test." am: 0b9f8de9be

Change-Id: I78d4a1c7dc57c5ed2528e0b53616500dc19e503c