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

Change-Id: Ia248316911992a2c319107a463254b9514f03f5b