Merge "Add vndservicemanager to default builds." into oc-dev
am: a4f90284c7

Change-Id: I13148e6efb9f7ecb57c95000b69392d6ec69b65f