Merge "remove BPF_NET_MAPS_FORCE_DISABLE_JAVA_BPF_MAP" into main