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

Change-Id: I6a6502d8d4c8d85e009bf1d3e87ebb88e14e7dfc