Merge "Merge "simpleperf: Fix record_cmd#check_trampoline test" into android12-tests-dev am: 927e0ca800" into android12L-tests-dev