Merge "Non ABI changes to neuralnetworks HAL" into sc-dev