Merge "Add tool annotating CFG with simpleperf data"