Merge "simpleperf: fix tests for dwarf callgraph unwinding." am: 35f8849075 am: ed3ee52f81 am: fe39f81b95
am: 9623e09ae5

Change-Id: I96bc3345e092be4b9e29c3928de5286630c88e72