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

Change-Id: Iade90f965facf1ef152884e792aa4e8a1b8b3659