Merge "wpa_supplicant(hidl): Fix compilation failures" am: bd2b658ed5
am: 0c5fdba03c

Change-Id: I7a2a192648a07c38f00c41f6fed2c7cc82c6f6c9