Merge "simpleperf: Fix test for llvm-objdump update" am: 43fdbcecc8

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

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