Merge "BpfMap.java - remove spurious import" into main