Merge "simpleperf: Fix record_cmd#check_trampoline test" into main am: 09fbf35747

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2744673

Change-Id: I56107c5a726af9e75eb191f956c0027194be7e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>