Merge "Rename android bpf library"