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

Change-Id: I7ef6e69b1a611663bff78bd2f3d7e2d1385e1603