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

Change-Id: Ic24155b1a3b6d5eb597a888adea56c30a5570dd9