Merge "Non ABI changes to neuralnetworks HAL"