Merge "Remove config_wifi_p2p_support from config.xml."