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

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

Change-Id: Id86133d0c6104b6fa4667a3fee76fdc60d7577e8