Merge "simpleperf: add SIMPLE_PERF_RECORD_TRACE_DATA record type."
am: 7a4786232d

Change-Id: Iad88f7d6566327ee1839bbc1155d93fc7443192e