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

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

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