Merge "Rename android bpf library" am: cfcb33cb32
am: 0ba8701f5c

Change-Id: Id9215d3dd6caa5b9b100a02f1972859179212317