Merge "Handle additional record types in perf.data reader."