Police make final arrest in border agent's death