Merge "Add an stune group for NNAPI HAL" am: 749f34bc35 am: afc1fb8007 am: 1e048a46ad

Change-Id: I0a7d50eb2363036b343cf0e6d6d3c43991bc573b