Merge "Add separate 'vndservice' binary." into oc-dev
am: cde29667e4

Change-Id: Iae0d0a37df6afdbd9f99b139afbcd6aa8a8c0c5a