Merge "simpleperf: Improve Callgraph." am: 37dd326f5a am: 2577b42281 am: 286f73ee1b
am: 8b1b311af5

Change-Id: Ie002d451f43b9fcac1cd4cf505a602b29601f3be