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

Change-Id: I7a92c9500fe07eb0c54a6ffd461801be00bc803a