Merge "Fix libselinux_vendor private header dependencies." am: bf3627db98 am: fa0823f66a
am: 9cf8591e30  -s ours

Change-Id: I5ea9c527445e7e9da3d530ecbc8c440de2727c2d