Merge "bpfloader: Try to load even if bpf.progs_loaded is set"
am: 4389649d8a

Change-Id: Id38ed8b188593735fcb1d13da9d282d633cabf4e