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

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

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