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

Change-Id: I858a0ad08dbe9b0ed7d13c23d3da1e38855c6286