Merge "[AWARE] Enhance TLV utils to support new TLV structs in NAN"