Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"