Merge \\"simpleperf: fix dumping symbols for unwinded ips.\\" am: 1ebe5df8ae
am: b4b2774b53

Change-Id: I8a61ddd0b33979a13ecfea47545e5a2be19f6256