GAS/ANQP is a generic protocol and in no way specific to P2P, so move routines used to build GAS/ANQP frames to a separate file that can be shared for other uses than just P2P service discovery.