Address wpa_supplicant vulnerabilities am: 7899587b4b am: 31f148388f

Change-Id: I64d044f2704725e5e740a12100ead2ddb970195f