Merge "Fix libselinux_vendor private header dependencies."