10621 audiohd cstyle cleanup

No differences encountered