Merge "remove BpfNetMaps.cpp" into main