Merge "simpleperf: Fix record_cmd#check_trampoline test" into main am: 09fbf35747 am: baf5fedc51 am: 0abc2268c0 am: a2fe44c2ed

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

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