Merge "simpleperf: fix annotate.py." am: cf6179e01f

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

Change-Id: I922040699bb62f60f18477a5ac1177c2aeb69c9f