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

Change-Id: Ia855d7889c25a6eca89f389f492347ccdbdaea3f