[wpa_supplicant] Cumulative patch from commit c54a5e96b am: e21d4e8dc6 am: c62742ddc3 am: 9821c7ae2f

Change-Id: Ib0b01b4e487efafd4b28c265cc7cf1106066fa99