Merge "Enable hvx NN service for oc-mr1-nn-dev"