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

Change-Id: I9df639b9eefe04c13c18d5f1176172bbb3f1beba