Merge "simpleperf: fix annotate.py." am: 9e6a8022f9 am: 4f519c445a
am: a34d6bfd00

Change-Id: I87d4bc0b802b435908f68b7e6a391e90f5ee335c