Merge "simpleperf: add script to annotate source code." am: dcfabd1ef6
am: 0ef4d4fd5f

Change-Id: I9c06aabee64e37a0776f1caf912b0720f8e122b0