Merge "Add tool annotating CFG with simpleperf data" am: 0eb7c66f6e

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1402528

Change-Id: I9118ba247f55c2b9edfcc13523fcc59ccfe701a0