Merge "simpleperf: fix annotate.py."
am: 9e6a8022f9

Change-Id: I84a8cec3fa66c348aa6f3fc15541ce56dd66f260