Merge "simpleperf: handle unexpected dso type error." am: b78eb761a0 am: 64e3ba7461

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

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