Detroit police officer wounded in April shootout dies