Death toll from police raid in Brazil rises to 21