Merge "Move the bpf ELF binary to system/etc/bpf"