Merge "Remove libselinux_vendor"
am: cd4895df08

Change-Id: I461e1ffd3d2f3b7e1ac4027b2a280eb9fc33a047