Merge "BpfNetMaps.java - add @Requires(T) to all native_ methods" into main