Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." am: 8565b665fa am: a4ea7070b2

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

Change-Id: I8cefa817a28847ff348745633e54f6566caaf719