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

Change-Id: I3ed2e28943962ea330ccd4b46c7a432272f16012