Merge "Revert "bpf: change how we detect device bpf support level""
am: 26dbcb7707

Change-Id: I51227ce953b7f7ee18b236c88285ca3ba26ea17a