Merge "wpa_supplicant(hidl): Fix compilation failure" am: 8361e7810b
am: be05c48040

Change-Id: I5379f77029a05e16be447167748306d2e6274670