Merge "BpfMap.java - add requires S+ annotation" into main