Merge "Remove deprecated soong_config_variable" into main