Merge "Do not split struct properties based on soong_config_variables" into main