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

Change-Id: I2f7127ca37647fb3d89e8467f3888bf396f5f239