Merge "Reapply "Switch to using typesafe kernel ebpf map accessors""