US: Charges upgraded for ex-officer in Floyd arrest