Revert "[wpa_supplicant] Cumulative patch from commit 0c5ededed" am: a5ae4a7eeb am: 8f330a9385

Change-Id: I40e0dba6b4e708c960889f79ac4299e27d9ae9b9