Merge "simpleperf: Fix record_cmd#check_trampoline test" into android12-tests-dev