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

Change-Id: Ia28053891fd6fa6a3c658488df51d09318f309d9