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

Change-Id: I8b11aca1837d050deef4c7ff9966ff08f0886808