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

Change-Id: I62a3a20aca469fa27ece789f975199c1d5c52901