Merge "Add an stune group for NNAPI HAL"