Merge tag 'android-4.4.2_r2' of https://android.googlesource.com/platform/external/wpa_supplicant_8 into kk

Android 4.4.2 Release 2
Fix build