Merge "simpleperf: fix segfault caused by reused thread ids."
am: 5df3f9ff95

Change-Id: If65c288263d3c046e07af31943072c336e6ee1ce