Merge "Add wpa_supplicant.conf to the core.mk"