Merge "Fix libselinux_vendor private header dependencies."
am: bf3627db98

Change-Id: I89c9f62c744d8582ff07f6d0052ed5e2a04c26b9