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

Change-Id: I34301b22c7ee6e041326f37ffd398245672fe926