Merge \"simpleperf: add thread_id in report_sample\'s output.\"
am: 0611ad5a36

Change-Id: Ib3b22e80e1f59827aa3ed65413ef2344c7ede390