Merge "Revert "bpf progs depend on system/core/libcutils/include"" am: de69647035 am: d2b62474fc

Change-Id: I732ba52c7b02b1f4b7100171d76f31aa3fb28a9d