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

Change-Id: I38d4ea935cad1f1917674c71b857e31379d36593