Merge "Remove unused BpfNetMap jni function"