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

Change-Id: I9cb97b66b33f09f6996fda57eca97fc18efa58a7