Merge "[AWARE] Actually shut-down functionality when destroying NAN iface" into oc-dr1-dev
am: 9424e9d541

Change-Id: Ia6990c90e8ffc17f2a88815d0cd53ac7dbffba31