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

Change-Id: Idbd7e549f9d7f0039c9afa85cff5db7827cbae48