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

Change-Id: I8d99e19ae00e047094f9baeacd7ce54d1aeb4b9b