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

Change-Id: Icc3d21d3946f8b3dee3def48fd430c3e2c738d23