Merge "cross-tool protocol: support CLOCK_BOOTTIME" into main