Merge "Add target for vndservice_contexts." into oc-dev
am: c3a9e7df5f

Change-Id: Ifcb4f63b7111252ee3a0deb58e6471b06df58587