wlan: caf proprietary cleanup

Removed proprietary code

Change-Id: I70f792cf63b7c82b2588c2d72a7694c9c20729a4
wlan: caf merge marker cleanup

Removed merge markers

Change-Id: I6305e4cd4a536f95580c96b8a26c524c8a791978
wlan: Release 3.2.3.249a

Release 3.2.3.249a includes:
70ea5e1 wlan: caf merge marker cleanup
735e62e wlan: caf proprietary cleanup

Change-Id: Ie26213fa9c5c67023ce28baab234fd66b29c1be5