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

Change-Id: Ib7b70509534fbae16f7d481762e83a577bf9a0b5