Merge "Revert "Log BPF programs & maps in bugreport""