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

Change-Id: I5af42f6a7b8536a31eda27cd9609fffc60829555