Merge "wlan: Fix for Compilation error." into wlan-aosp.lnx.5.0

mentioned in commit 9dc053bb

mentioned in commit 0fde7fbf

mentioned in commit 3ae61029

mentioned in commit c38956ed

mentioned in commit 881cf955

mentioned in commit 1d8a3205

mentioned in commit a46444d4

mentioned in commit 1ee728eb

mentioned in commit 1b2ac9b3

mentioned in commit 3f490fe5

mentioned in commit 040fafec

mentioned in commit 0282a3ed