Merge "simpleperf: add script to annotate source code." am: dcfabd1ef6 am: 0ef4d4fd5f am: 706631a1a0
am: 71a252b7b5

Change-Id: I0dd570c5867ce4822b0c2e88e1fd91fd76048354