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

Change-Id: I312359cf5884664a236e56c12933c54352b841ab