Merge "Adds the Neural Networks lib to the base configuration." into oc-mr1-dev