Merge pids

[batesj]

No description provided.

[741g]

Hi, there's a conflict in vperfetto-sdk.cpp that might be a bit more than purely syntactical:

<<<<<<< merge_pids
    // Use the same offset in case pids and tids are mixed up.
    uint32_t maxPidTid = std::max(maxMainPid, maxMainTid);
    // Use an offset that is easy to read out the original addon pid for debugging.
    uint64_t pidTidOffset = 1000000;
    while(pidTidOffset < maxPidTid)
        pidTidOffset *= 10;

=======
>>>>>>> main

Was there a divergence earlier? If so, please include that commit too. Otherwise, thanks for the fixes and additional tracking!