Merge "NetBpfLoad: enforce kernel 5.4 for Android W" into main