am 6a116f86: am eb2e4a48: (-s ours) am 5c9978ce: Merge "Simpleperf: use ThreadTree when getting hit files in record command."

* commit '6a116f863826943b1ec78d8f6bf84714daa70620':