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

Change-Id: Icbd43c6315d710fddfc1633809988a900d4a9796