Merge "Change vndservicemanger's dep on libselinux to libselinux_vendor"