Merge "remove unneeded inclusions of libbpf_android"