Merge "Rename android bpf library"
am: cfcb33cb32

Change-Id: Iac5309bbe8b7669b31cc490461daeda4978f37f9