Merge "Move dumpRawMap to BpfDump" into main