Merge "vndservicemanager: remove static dependency on libselinux"
am: d11172e384  -s ours

Change-Id: I68dd5325439315dc58bcfc1e7d53e622e17ec7db