Fix the sdk generation with the new staging_dir layout