L2CAP socket - fix merge errors

This fixes a few changes that was reverted by mistake,
causing uninitialized data to be used as instance data
in GAP and no buffers allocated to the L2CAP sockets.

Change-Id: I060c5faf602c1dedcc34b4acd1417949820a4da4
5 files changed