Merge "Add WIFI_ variables into soong config"