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

Change-Id: Ibfa87c5a4637dc1110dcd0cbd159b7d4203949ca