[wpa_supplicant] Cumulative patch from commit c54a5e96b am: e21d4e8dc6 am: c62742ddc3 am: 2c6e959c6d

Change-Id: Ifdc2641d9af035276e79e4e91ecc67d8936e98a3