Merge "wpa_supplicant: remove the qcom definition from general config"