Merge "Revert "bpf progs depend on system/core/libcutils/include""