Merge "simpleperf: fix deobfuscating Java symbols." am: 73ecedc8ce

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

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