Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38

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

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